[date]
") expect(cooked).to_not include('data-date=') end + + it 'requires the right attributes to convert to a local date' do + post = Fabricate(:post, raw: <<~TXT) + [date] + TXT + + cooked = post.cooked + + expect(post.cooked).to include("[date]
") + expect(cooked).to_not include('data-date=') + end + + it 'it works with only a date and time' do + raw = "[date=2018-11-01 time=12:00]" + cooked = Fabricate(:post, raw: raw).cooked + expect(cooked).to include('data-date="2018-11-01"') + expect(cooked).to include('data-time="12:00"') + end + + it 'doesn’t include format by default' do + raw = "[date=2018-11-01 time=12:00]" + cooked = Fabricate(:post, raw: raw).cooked + expect(cooked).not_to include('data-format=') + end + + it 'doesn’t include timezone by default' do + raw = "[date=2018-11-01 time=12:00]" + cooked = Fabricate(:post, raw: raw).cooked + + expect(cooked).not_to include("data-timezone=") + end end diff --git a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb index 216ac55d258..3a50e304fdb 100644 --- a/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb +++ b/plugins/discourse-local-dates/spec/lib/pretty_text_spec.rb @@ -1,24 +1,52 @@ require 'rails_helper' +def generate_html(text, opts = {}) + output = "" +end + describe PrettyText do - it 'uses a simplified syntax in emails' do + before do freeze_time - cooked = PrettyText.cook <<~MD - [date=2018-05-08 time=22:00 format=LLL timezones="Europe/Paris|America/Los_Angeles"] - MD - cooked_mail = <<~HTML -
May 9, 2018 12:00 AM (Europe: Paris)
- HTML + end - expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail) + context 'emails simplified rendering' do + it 'works with default markup' do + cooked = PrettyText.cook("[date=2018-05-08]") + cooked_mail = generate_html("2018-05-08T00:00:00Z (Etc: UTC)", + date: "2018-05-08", + email_preview: "2018-05-08T00:00:00Z (Etc: UTC)" + ) - cooked = PrettyText.cook <<~MD - [date=2018-05-08 format=LLL timezone="Europe/Berlin" timezones="Europe/Paris|America/Los_Angeles"] - MD - cooked_mail = <<~HTML -May 8, 2018 12:00 AM (Europe: Paris)
- HTML + expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail) + end - expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail) + it 'works with format' do + cooked = PrettyText.cook("[date=2018-05-08 format=LLLL]") + cooked_mail = generate_html("Tuesday, May 8, 2018 12:00 AM (Etc: UTC)", + date: "2018-05-08", + email_preview: "Tuesday, May 8, 2018 12:00 AM (Etc: UTC)", + format: "LLLL" + ) + + expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail) + end + + it 'works with time' do + cooked = PrettyText.cook("[date=2018-05-08 time=20:00:00]") + cooked_mail = generate_html("2018-05-08T20:00:00Z (Etc: UTC)", + date: "2018-05-08", + email_preview: "2018-05-08T20:00:00Z (Etc: UTC)", + time: "20:00:00" + ) + + expect(PrettyText.format_for_email(cooked)).to match_html(cooked_mail) + end end end diff --git a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js.es6 new file mode 100644 index 00000000000..4d28a71b599 --- /dev/null +++ b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js.es6 @@ -0,0 +1,50 @@ +import { acceptance } from "helpers/qunit-helpers"; + +acceptance("Local Dates - composer", { + loggedIn: true, + settings: { discourse_local_dates_enabled: true } +}); + +test("composer bbcode", async assert => { + const getAttr = attr => { + return find(".d-editor-preview .discourse-local-date.cooked-date").attr( + `data-${attr}` + ); + }; + + await visit("/"); + await click("#create-topic"); + + await fillIn( + ".d-editor-input", + '[date=2017-10-23 time=01:30:00 displayedZone="America/Chicago" format="LLLL" calendar="off" recurring="1.weeks" timezone="Asia/Calcutta" timezones="Europe/Paris|America/Los_Angeles"]' + ); + + assert.equal(getAttr("date"), "2017-10-23", "it has the correct date"); + assert.equal(getAttr("time"), "01:30:00", "it has the correct time"); + assert.equal( + getAttr("displayed-zone"), + "America/Chicago", + "it has the correct displayed zone" + ); + assert.equal(getAttr("format"), "LLLL", "it has the correct format"); + assert.equal( + getAttr("timezones"), + "Europe/Paris|America/Los_Angeles", + "it has the correct timezones" + ); + assert.equal(getAttr("recurring"), "1.weeks", "it has the correct recurring"); + assert.equal( + getAttr("timezone"), + "Asia/Calcutta", + "it has the correct timezone" + ); + + await fillIn( + ".d-editor-input", + '[date=2017-10-24 format="LL" timezone="Asia/Calcutta" timezones="Europe/Paris|America/Los_Angeles"]' + ); + + assert.equal(getAttr("date"), "2017-10-24", "it has the correct date"); + assert.notOk(getAttr("time"), "it doesn’t have time"); +}); diff --git a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6 b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6 index a9e9b2461ac..2d7d5e500f2 100644 --- a/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6 +++ b/plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6 @@ -1,62 +1,254 @@ import { acceptance } from "helpers/qunit-helpers"; -import { clearPopupMenuOptionsCallback } from "discourse/controllers/composer"; + +const sandbox = sinon.createSandbox(); acceptance("Local Dates", { loggedIn: true, settings: { discourse_local_dates_enabled: true }, beforeEach() { - clearPopupMenuOptionsCallback(); + freezeDateAndZone(); }, afterEach() { - sinon.restore(); + sandbox.restore(); + moment.tz.setDefault(); } }); -test("at removal", assert => { - let now = moment("2018-06-20").valueOf(); - let timezone = moment.tz.guess(); +const DEFAULT_DATE = "2018-06-20"; +const DEFAULT_ZONE = "Europe/Paris"; - sinon.useFakeTimers(now); +function advance(count, unit = "days") { + return moment(DEFAULT_DATE) + .add(count, unit) + .format("YYYY-MM-DD"); +} - let html = ``; +function rewind(count, unit = "days") { + return moment(DEFAULT_DATE) + .subtract(count, unit) + .format("YYYY-MM-DD"); +} - let yesterday = $(html.replace("DATE", "2018-06-19")); - yesterday.applyLocalDates(); +function freezeDateAndZone(date, zone, cb) { + date = date || DEFAULT_DATE; + zone = zone || DEFAULT_ZONE; - assert.equal(yesterday.text(), "Yesterday 2:42 PM"); + sandbox.restore(); + sandbox.stub(moment.tz, "guess"); + moment.tz.guess.returns(zone); - let today = $(html.replace("DATE", "2018-06-20")); - today.applyLocalDates(); + const now = moment(date).valueOf(); + sandbox.useFakeTimers(now); - assert.equal(today.text(), "Today 2:42 PM"); + if (cb) { + cb(); - let tomorrow = $(html.replace("DATE", "2018-06-21")); - tomorrow.applyLocalDates(); + moment.tz.guess.returns(DEFAULT_ZONE); + sandbox.useFakeTimers(moment(DEFAULT_DATE).valueOf()); + } +} - assert.equal(tomorrow.text(), "Tomorrow 2:42 PM"); -}); +function generateHTML(options = {}) { + let output = ` { - await visit("/"); - await click("#create-topic"); + output += ` data-date="${options.date || DEFAULT_DATE}"`; + if (options.format) output += ` data-format="${options.format}"`; + if (options.time) output += ` data-time="${options.time}"`; + if (options.calendar) output += ` data-calendar="${options.calendar}"`; + if (options.recurring) output += ` data-recurring="${options.recurring}"`; + if (options.displayedZone) + output += ` data-displayed-zone="${options.displayedZone}"`; - await fillIn( - ".d-editor-input", - '[date=2017-10-23 time=01:30:00 format="LL" timezone="Asia/Calcutta" timezones="Europe/Paris|America/Los_Angeles"]' - ); + return (output += ">"); +} - assert.ok( - exists(".d-editor-preview .discourse-local-date.past.cooked-date"), - "it should contain the cooked output for date & time inputs" - ); +test("default format - time specified", assert => { + const html = generateHTML({ date: advance(3), time: "00:00" }); + const transformed = $(html).applyLocalDates(); - await fillIn( - ".d-editor-input", - '[date=2017-10-23 format="LL" timezone="Asia/Calcutta" timezones="Europe/Paris|America/Los_Angeles"]' - ); - - assert.ok( - exists(".d-editor-preview .discourse-local-date.past.cooked-date"), - "it should contain the cooked output for date only input" + assert.equal( + transformed.text(), + "June 23, 2018 2:00 AM", + "it uses moment LLL format" ); }); + +test("default format - no time specified", assert => { + const html = generateHTML({ date: advance(3) }); + const transformed = $(html).applyLocalDates(); + + assert.equal( + transformed.text(), + "June 23, 2018", + "it uses moment LL format as default if not time is specified" + ); +}); + +test("today", assert => { + const html = generateHTML({ time: "14:00" }); + const transformed = $(html).applyLocalDates(); + + assert.equal(transformed.text(), "Today 4:00 PM", "it display Today"); +}); + +test("today - no time", assert => { + const html = generateHTML(); + const transformed = $(html).applyLocalDates(); + + assert.equal(transformed.text(), "Today", "it display Today without time"); +}); + +test("yesterday", assert => { + const html = generateHTML({ date: rewind(1), time: "14:00" }); + const transformed = $(html).applyLocalDates(); + + assert.equal( + transformed.text(), + "Yesterday 4:00 PM", + "it displays yesterday" + ); +}); + +QUnit.skip("yesterday - no time", assert => { + const html = generateHTML({ date: rewind(1) }); + const transformed = $(html).applyLocalDates(); + + assert.equal( + transformed.text(), + "Yesterday", + "it displays yesterday without time" + ); +}); + +test("tomorrow", assert => { + const html = generateHTML({ date: advance(1), time: "14:00" }); + const transformed = $(html).applyLocalDates(); + + assert.equal(transformed.text(), "Tomorrow 4:00 PM", "it displays tomorrow"); +}); + +test("tomorrow - no time", assert => { + const html = generateHTML({ date: advance(1) }); + const transformed = $(html).applyLocalDates(); + + assert.equal( + transformed.text(), + "Tomorrow", + "it displays tomorrow without time" + ); +}); + +test("today - no time with different zones", assert => { + const html = generateHTML(); + let transformed = $(html).applyLocalDates(); + + assert.equal(transformed.text(), "Today", "it displays today without time"); + + freezeDateAndZone(rewind(12, "hours"), "Pacific/Auckland", () => { + transformed = $(html).applyLocalDates(); + assert.equal( + transformed.text(), + "Tomorrow", + "it displays Tomorrow without time" + ); + }); +}); + +test("calendar off", assert => { + const html = generateHTML({ calendar: "off", time: "14:00" }); + const transformed = $(html).applyLocalDates(); + + assert.equal( + transformed.text(), + "June 20, 2018 4:00 PM", + "it displays the date without Today" + ); +}); + +test("recurring", assert => { + const html = generateHTML({ recurring: "1.week", time: "14:00" }); + let transformed = $(html).applyLocalDates(); + + assert.equal( + transformed.text(), + "Today 4:00 PM", + "it displays the next occurrence" + ); + + freezeDateAndZone(advance(1), () => { + transformed = $(html).applyLocalDates(); + + assert.equal( + transformed.text(), + "June 27, 2018 4:00 PM", + "it displays the next occurrence" + ); + }); +}); + +test("displayedZone", assert => { + const html = generateHTML({ + date: advance(3), + displayedZone: "Etc/UTC", + time: "14:00" + }); + const transformed = $(html).applyLocalDates(); + + assert.equal( + transformed.text(), + "June 23, 2018 2:00 PM", + "it forces display in the given timezone" + ); +}); + +test("format", assert => { + const html = generateHTML({ + date: advance(3), + format: "YYYY | MM - DD" + }); + const transformed = $(html).applyLocalDates(); + + assert.equal( + transformed.text(), + "2018 | 06 - 23", + "it uses the given format" + ); +}); + +test("test utils", assert => { + assert.equal( + moment().format("LLLL"), + moment(DEFAULT_DATE).format("LLLL"), + "it has defaults" + ); + assert.equal(moment.tz.guess(), DEFAULT_ZONE, "it has defaults"); + + freezeDateAndZone(advance(1), DEFAULT_ZONE, () => { + assert.equal( + moment().format("LLLL"), + moment(DEFAULT_DATE) + .add(1, "days") + .format("LLLL"), + "it applies new time" + ); + assert.equal(moment.tz.guess(), DEFAULT_ZONE); + }); + + assert.equal( + moment().format("LLLL"), + moment(DEFAULT_DATE).format("LLLL"), + "it restores time" + ); + + freezeDateAndZone(advance(1), "Pacific/Auckland", () => { + assert.equal( + moment().format("LLLL"), + moment(DEFAULT_DATE) + .add(1, "days") + .format("LLLL") + ); + assert.equal(moment.tz.guess(), "Pacific/Auckland", "it applies new zone"); + }); + + assert.equal(moment.tz.guess(), DEFAULT_ZONE, "it restores zone"); +});