github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: refactoring and better handling of special cases (#6666)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-11-26 14:20:32 +01:00
committed by GitHub
parent 3453707784
commit b0d08b5a8c
10 changed files with 605 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js.es6
View File

@ -17,15 +17,15 @@ test("composer bbcode", async assert => {
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"]'
'[date=2017-10-23 time=01:30:00 displayedTimezone="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"),
getAttr("displayed-timezone"),
"America/Chicago",
"it has the correct displayed zone"
"it has the correct displayed timezone"
);
assert.equal(getAttr("format"), "LLLL", "it has the correct format");
assert.equal(

224
plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
View File

@ -16,6 +16,7 @@ acceptance("Local Dates", {
const DEFAULT_DATE = "2018-06-20";
const DEFAULT_ZONE = "Europe/Paris";
const DEFAULT_ZONE_FORMATED = DEFAULT_ZONE.split("/").join(": ");
function advance(count, unit = "days") {
return moment(DEFAULT_DATE)
@ -54,56 +55,72 @@ function generateHTML(options = {}) {
output += ` data-date="${options.date || DEFAULT_DATE}"`;
if (options.format) output += ` data-format="${options.format}"`;
if (options.time) output += ` data-time="${options.time}"`;
output += ` data-timezone="${options.timezone || DEFAULT_ZONE}"`;
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}"`;
if (options.displayedTimezone)
output += ` data-displayed-timezone="${options.displayedTimezone}"`;
return (output += "></span>");
}
test("default format - time specified", assert => {
const html = generateHTML({ date: advance(3), time: "00:00" });
const html = generateHTML({ date: advance(3), time: "02:00" });
const transformed = $(html).applyLocalDates();
assert.equal(
transformed.text(),
transformed.text().trim(),
"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();
let html = generateHTML({ date: advance(3) });
let transformed = $(html).applyLocalDates();
assert.equal(
transformed.text(),
transformed.text().trim(),
"June 23, 2018",
"it uses moment LL format as default if not time is specified"
);
freezeDateAndZone(advance(1), "Pacific/Auckland", () => {
html = generateHTML({ date: advance(3) });
transformed = $(html).applyLocalDates();
assert.equal(
transformed.text().trim(),
`June 23, 2018 (${DEFAULT_ZONE_FORMATED})`,
"it appends creator timezone if watching user timezone is different"
);
});
});
test("today", assert => {
const html = generateHTML({ time: "14:00" });
const html = generateHTML({ time: "16:00" });
const transformed = $(html).applyLocalDates();
assert.equal(transformed.text(), "Today 4:00 PM", "it display Today");
assert.equal(transformed.text().trim(), "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");
assert.equal(
transformed.text().trim(),
"Today",
"it display Today without time"
);
});
test("yesterday", assert => {
const html = generateHTML({ date: rewind(1), time: "14:00" });
const html = generateHTML({ date: rewind(1), time: "16:00" });
const transformed = $(html).applyLocalDates();
assert.equal(
transformed.text(),
transformed.text().trim(),
"Yesterday 4:00 PM",
"it displays yesterday"
);
@ -114,17 +131,21 @@ QUnit.skip("yesterday - no time", assert => {
const transformed = $(html).applyLocalDates();
assert.equal(
transformed.text(),
transformed.text().trim(),
"Yesterday",
"it displays yesterday without time"
);
});
test("tomorrow", assert => {
const html = generateHTML({ date: advance(1), time: "14:00" });
const html = generateHTML({ date: advance(1), time: "16:00" });
const transformed = $(html).applyLocalDates();
assert.equal(transformed.text(), "Tomorrow 4:00 PM", "it displays tomorrow");
assert.equal(
transformed.text().trim(),
"Tomorrow 4:00 PM",
"it displays tomorrow"
);
});
test("tomorrow - no time", assert => {
@ -132,7 +153,7 @@ test("tomorrow - no time", assert => {
const transformed = $(html).applyLocalDates();
assert.equal(
transformed.text(),
transformed.text().trim(),
"Tomorrow",
"it displays tomorrow without time"
);
@ -142,35 +163,39 @@ 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");
assert.equal(
transformed.text().trim(),
"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"
transformed.text().trim(),
`June 20, 2018 (${DEFAULT_ZONE_FORMATED})`,
"it displays the date without calendar and creator timezone"
);
});
});
test("calendar off", assert => {
const html = generateHTML({ calendar: "off", time: "14:00" });
const html = generateHTML({ calendar: "off", time: "16:00" });
const transformed = $(html).applyLocalDates();
assert.equal(
transformed.text(),
transformed.text().trim(),
"June 20, 2018 4:00 PM",
"it displays the date without Today"
);
});
test("recurring", assert => {
const html = generateHTML({ recurring: "1.week", time: "14:00" });
const html = generateHTML({ recurring: "1.week", time: "16:00" });
let transformed = $(html).applyLocalDates();
assert.equal(
transformed.text(),
transformed.text().trim(),
"Today 4:00 PM",
"it displays the next occurrence"
);
@ -179,28 +204,13 @@ test("recurring", assert => {
transformed = $(html).applyLocalDates();
assert.equal(
transformed.text(),
transformed.text().trim(),
"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),
@ -209,12 +219,144 @@ test("format", assert => {
const transformed = $(html).applyLocalDates();
assert.equal(
transformed.text(),
transformed.text().trim(),
"2018 | 06 - 23",
"it uses the given format"
);
});
test("displayedTimezone", assert => {
let html = generateHTML({
date: advance(3),
displayedTimezone: "America/Chicago",
time: "16:00"
});
let transformed = $(html).applyLocalDates();
assert.equal(
transformed.text().trim(),
"June 23, 2018 9:00 AM (America: Chicago)",
"it displays timezone when different from watching user"
);
html = generateHTML({
date: advance(3),
displayedTimezone: DEFAULT_ZONE,
time: "16:00"
});
transformed = $(html).applyLocalDates();
assert.equal(
transformed.text().trim(),
"June 23, 2018 4:00 PM",
"it doesn’t display timezone when same from watching user"
);
html = generateHTML({ displayedTimezone: "Etc/UTC" });
transformed = $(html).applyLocalDates();
assert.equal(
transformed.text().trim(),
"June 19, 2018 (UTC)",
"it displays timezone and drops calendar mode when timezone is different from watching user"
);
html = generateHTML({ displayedTimezone: DEFAULT_ZONE });
transformed = $(html).applyLocalDates();
assert.equal(
transformed.text().trim(),
"Today",
"it doesn’t display timezone and doesn’t drop calendar mode when timezone is same from watching user"
);
html = generateHTML({
timezone: "America/Chicago"
});
transformed = $(html).applyLocalDates();
assert.equal(
transformed.text().trim(),
"June 20, 2018 (America: Chicago)",
"it uses timezone when displayedTimezone is not set"
);
html = generateHTML();
transformed = $(html).applyLocalDates();
assert.equal(
transformed.text().trim(),
"Today",
"it uses user’s timezone when displayedTimezone and timezone are not set"
);
html = generateHTML({
timezone: "America/Chicago",
displayedTimezone: "Pacific/Auckland"
});
transformed = $(html).applyLocalDates();
assert.equal(
transformed.text().trim(),
"June 20, 2018 (Pacific: Auckland)",
"it uses displayedTimezone over timezone"
);
});
test("tooltip", assert => {
let html = generateHTML({ timezone: "America/Chicago" });
let transformed = $(html).applyLocalDates();
let htmlToolip = transformed.attr("data-html-tooltip");
let currentUserPreview = $(htmlToolip).find(".preview.current");
let timezone = currentUserPreview.find(".timezone").text();
let dateTime = currentUserPreview.find(".date-time").text();
assert.equal(
timezone,
DEFAULT_ZONE_FORMATED,
"it creates a range adjusted to watching user timezone"
);
assert.equal(
dateTime,
"June 20, 2018 7:00 AM → June 21, 2018 7:00 AM",
"it creates a range adjusted to watching user timezone"
);
freezeDateAndZone(DEFAULT_DATE, "Pacific/Auckland", () => {
html = generateHTML({ timezone: "Pacific/Auckland" });
transformed = $(html).applyLocalDates();
htmlToolip = transformed.attr("data-html-tooltip");
currentUserPreview = $(htmlToolip).find(".preview.current");
assert.notOk(
exists(currentUserPreview),
"it doesn’t create entry if watching user has the same timezone than creator"
);
});
html = generateHTML({ timezone: "America/Chicago", time: "14:00:00" });
transformed = $(html).applyLocalDates();
htmlToolip = transformed.attr("data-html-tooltip");
const $preview = $(htmlToolip)
.find(".preview")
.first();
dateTime = $preview.find(".date-time").text();
timezone = $preview.find(".timezone").text();
assert.ok(
!exists(".preview.current"),
"doesn’t create current timezone when displayed timezone equals watching user timezone"
);
assert.equal(
dateTime,
"June 20, 2018 7:00 PM",
"it doesn’t create range if time has been set"
);
assert.equal(timezone, "UTC", "Etc/UTC is rewritten to UTC");
});
test("test utils", assert => {
assert.equal(
moment().format("LLLL"),