{{#if canAdminTags}}
{{tags-admin-dropdown actionsMapping=actionsMapping}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/tags/show.hbs b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
index ca59b27c9b..a064771eb2 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/show.hbs
@@ -5,53 +5,32 @@
-
+
+
{{#if showTagFilter}}
- {{bread-crumbs
- categories=categories
- category=category
- tagId=tag.id
- noSubcategories=noSubcategories
- }}
- {{navigation-bar navItems=navItems filterMode=filterMode}}
+ {{#if additionalTags}}
+ {{!-- Tag intersections don't work with the tag filter, so show the tag heading instead --}}
+ {{tag-heading tag=tag additionalTags=additionalTags}}
+ {{/if}}
{{else}}
-
- {{#link-to "tags"}}{{i18n "tagging.tags"}}{{/link-to}}
- {{d-icon "angle-right"}}
- {{discourse-tag-bound tagRecord=tag style="simple"}}
- {{#each additionalTags as |tag|}}
- &
- {{discourse-tag tag style="simple"}}
- {{/each}}
-
+ {{tag-heading tag=tag additionalTags=additionalTags}}
{{/if}}
- {{#if tagNotification}}
- {{#unless additionalTags}}
- {{tag-notifications-button
- onChange=(action "changeTagNotificationLevel")
- value=tagNotification.notification_level
- }}
- {{/unless}}
- {{/if}}
-
- {{plugin-outlet name="before-create-topic-button"
- args=(hash
- canCreateTopic=canCreateTopic
- createTopicDisabled=createTopicDisabled
- createTopicLabel=createTopicLabel)
- }}
-
- {{create-topic-button
+ {{d-navigation
+ filterMode=filterMode
canCreateTopic=canCreateTopic
- disabled=createTopicDisabled
- label=createTopicLabel
- action=(route-action "createTopic")
- }}
-
- {{#if showToggleInfo}}
- {{d-button icon="tag" class="btn-default" label="tagging.info" action=(action "toggleInfo") id="show-tag-info"}}
- {{/if}}
+ hasDraft=draft
+ createTopic=(route-action "createTopic")
+ category=category
+ tag=tag
+ noSubcategories=noSubcategories
+ tagNotification=tagNotification
+ additionalTags=additionalTags
+ showInfo=showInfo
+ canCreateTopicOnTag=canCreateTopicOnTag
+ changeTagNotificationLevel=(action "changeTagNotificationLevel")
+ toggleInfo=(action "toggleInfo")
+ }}
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index de1409211f..52acbebd53 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -215,8 +215,7 @@
rebakePost=(action "rebakePost")
changePostOwner=(action "changePostOwner")
grantBadge=(action "grantBadge")
- addNotice=(action "addNotice")
- removeNotice=(action "removeNotice")
+ changeNotice=(action "changeNotice")
lockPost=(action "lockPost")
unlockPost=(action "unlockPost")
unhidePost=(action "unhidePost")
diff --git a/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js b/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
index b960269627..46d5db1231 100644
--- a/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
+++ b/app/assets/javascripts/discourse/app/widgets/liked-notification-item.js
@@ -15,14 +15,14 @@ createWidgetFrom(DefaultNotificationItem, "liked-notification-item", {
if (count === 0) {
return I18n.t("notifications.liked_2", {
description,
- username,
- username2,
+ username: `
${username} `,
+ username2: `
${username2} `,
});
} else {
return I18n.t("notifications.liked_many", {
description,
- username,
- username2,
+ username: `
${username} `,
+ username2: `
${username2} `,
count,
});
}
diff --git a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
index 5daacd0a41..b2c509fb57 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-admin-menu.js
@@ -53,21 +53,16 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
}
if (attrs.canEditStaffNotes) {
- if (attrs.noticeType) {
- contents.push({
- icon: "user-shield",
- label: "post.controls.remove_post_notice",
- action: "removeNotice",
- className: "popup-menu-button remove-notice",
- });
- } else {
- contents.push({
- icon: "user-shield",
- label: "post.controls.add_post_notice",
- action: "addNotice",
- className: "popup-menu-button add-notice",
- });
- }
+ contents.push({
+ icon: "user-shield",
+ label: attrs.notice
+ ? "post.controls.change_post_notice"
+ : "post.controls.add_post_notice",
+ action: "changeNotice",
+ className: attrs.notice
+ ? "popup-menu-button change-notice"
+ : "popup-menu-button add-notice",
+ });
}
if (attrs.canManage && attrs.hidden) {
diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js
index a63263ea29..07cc0bc988 100644
--- a/app/assets/javascripts/discourse/app/widgets/post.js
+++ b/app/assets/javascripts/discourse/app/widgets/post.js
@@ -471,7 +471,7 @@ createWidget("post-notice", {
tagName: "div.post-notice",
buildClasses(attrs) {
- const classes = [attrs.noticeType.replace(/_/g, "-")];
+ const classes = [attrs.notice.type.replace(/_/g, "-")];
if (
new Date() - new Date(attrs.created_at) >
@@ -484,30 +484,33 @@ createWidget("post-notice", {
},
html(attrs) {
+ if (attrs.notice.type === "custom") {
+ return [
+ iconNode("user-shield"),
+ new RawHtml({ html: `
${attrs.notice.cooked}
` }),
+ ];
+ }
+
const user =
this.siteSettings.display_name_on_posts && prioritizeNameInUx(attrs.name)
? attrs.name
: attrs.username;
- let text, icon;
- if (attrs.noticeType === "custom") {
- icon = "user-shield";
- text = new RawHtml({ html: `
${attrs.noticeMessage}
` });
- } else if (attrs.noticeType === "new_user") {
- icon = "hands-helping";
- text = h("p", I18n.t("post.notice.new_user", { user }));
- } else if (attrs.noticeType === "returning_user") {
- icon = "far-smile";
- const distance = (new Date() - new Date(attrs.noticeTime)) / 1000;
- text = h(
- "p",
- I18n.t("post.notice.returning_user", {
- user,
- time: relativeAgeMediumSpan(distance, true),
- })
- );
+
+ if (attrs.notice.type === "new_user") {
+ return [
+ iconNode("hands-helping"),
+ h("p", I18n.t("post.notice.new_user", { user })),
+ ];
}
- return [iconNode(icon), text];
+ if (attrs.notice.type === "returning_user") {
+ const timeAgo = (new Date() - new Date(attrs.notice.lastPostedAt)) / 1000;
+ const time = relativeAgeMediumSpan(timeAgo, true);
+ return [
+ iconNode("far-smile"),
+ h("p", I18n.t("post.notice.returning_user", { user, time })),
+ ];
+ }
},
});
@@ -593,7 +596,7 @@ createWidget("post-article", {
);
}
- if (attrs.noticeType) {
+ if (!attrs.deleted_at && attrs.notice) {
rows.push(h("div.row", [this.attach("post-notice", attrs)]));
}
diff --git a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
index 4f1a6cf4ce..5b32c40954 100644
--- a/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
+++ b/app/assets/javascripts/discourse/app/widgets/quick-access-profile.js
@@ -56,6 +56,15 @@ createWidgetFrom(QuickAccessPanel, "quick-access-profile", {
},
];
+ if (this.currentUser.can_invite_to_forum) {
+ defaultItems.push({
+ icon: "user-plus",
+ href: `${this.attrs.path}/invited`,
+ content: I18n.t("user.invited.title"),
+ className: "invites",
+ });
+ }
+
defaultItems.push(
{
icon: "pencil-alt",
diff --git a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
index f5e1eb5f42..a022ac3b40 100644
--- a/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/topic-admin-menu.js
@@ -153,7 +153,10 @@ export default createWidget("topic-admin-menu", {
});
}
- if (this.get("currentUser.canManageTopic")) {
+ if (
+ this.get("currentUser.canManageTopic") ||
+ details.get("can_moderate_category")
+ ) {
if (details.get("can_delete")) {
this.addActionButton({
className: "topic-admin-delete",
diff --git a/app/assets/javascripts/discourse/tests/acceptance/about-test.js b/app/assets/javascripts/discourse/tests/acceptance/about-test.js
index 9f0afe82ed..f16b59924e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/about-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/about-test.js
@@ -4,7 +4,7 @@ import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("About", function () {
- test("viewing", async (assert) => {
+ test("viewing", async function (assert) {
await visit("/about");
assert.ok($("body.about-page").length, "has body class");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js b/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js
index a7111dd861..8dc7d47a9c 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js
@@ -1,12 +1,12 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { visit, click, fillIn } from "@ember/test-helpers";
+import { visit, click, fillIn, currentRouteName } from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
import PreloadStore from "discourse/lib/preload-store";
acceptance("Account Created", function () {
- test("account created - message", async (assert) => {
+ test("account created - message", async function (assert) {
PreloadStore.store("accountCreated", {
message: "Hello World",
});
@@ -21,7 +21,7 @@ acceptance("Account Created", function () {
assert.notOk(exists(".activation-controls"));
});
- test("account created - resend email", async (assert) => {
+ test("account created - resend email", async function (assert) {
PreloadStore.store("accountCreated", {
message: "Hello World",
username: "eviltrout",
@@ -40,12 +40,12 @@ acceptance("Account Created", function () {
await click(".activation-controls .resend");
- assert.equal(currentPath(), "account-created.resent");
+ assert.equal(currentRouteName(), "account-created.resent");
const email = queryAll(".account-created .ac-message b").text();
assert.equal(email, "eviltrout@example.com");
});
- test("account created - update email - cancel", async (assert) => {
+ test("account created - update email - cancel", async function (assert) {
PreloadStore.store("accountCreated", {
message: "Hello World",
username: "eviltrout",
@@ -57,15 +57,15 @@ acceptance("Account Created", function () {
await click(".activation-controls .edit-email");
- assert.equal(currentPath(), "account-created.edit-email");
+ assert.equal(currentRouteName(), "account-created.edit-email");
assert.ok(queryAll(".activation-controls .btn-primary:disabled").length);
await click(".activation-controls .edit-cancel");
- assert.equal(currentPath(), "account-created.index");
+ assert.equal(currentRouteName(), "account-created.index");
});
- test("account created - update email - submit", async (assert) => {
+ test("account created - update email - submit", async function (assert) {
PreloadStore.store("accountCreated", {
message: "Hello World",
username: "eviltrout",
@@ -85,7 +85,7 @@ acceptance("Account Created", function () {
await click(".activation-controls .btn-primary");
- assert.equal(currentPath(), "account-created.resent");
+ assert.equal(currentRouteName(), "account-created.resent");
const email = queryAll(".account-created .ac-message b").text();
assert.equal(email, "newemail@example.com");
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js
index 871a229dd6..30c3c1b408 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-emails-test.js
@@ -28,7 +28,7 @@ acceptance("Admin - Emails", function (needs) {
});
});
- test("shows selected and elided text", async (assert) => {
+ test("shows selected and elided text", async function (assert) {
await visit("/admin/email/advanced-test");
await fillIn("textarea.email-body", EMAIL.trim());
await click(".email-advanced-test button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js
index 654e6d00ae..723534e0ea 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-search-log-term-test.js
@@ -6,7 +6,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Admin - Search Log Term", function (needs) {
needs.user();
- test("show search log term details", async (assert) => {
+ test("show search log term details", async function (assert) {
await visit("/admin/logs/search_logs/term?term=ruby");
assert.ok($("div.search-logs-filter").length, "has the search type filter");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js
index 576059584c..c5bb95d914 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-search-logs-test.js
@@ -6,7 +6,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Admin - Search Logs", function (needs) {
needs.user();
- test("show search logs", async (assert) => {
+ test("show search logs", async function (assert) {
await visit("/admin/logs/search_logs");
assert.ok($("table.search-logs-list.grid").length, "has the div class");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
index a0ea84dcae..8c026a8424 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
@@ -1,5 +1,12 @@
+import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { fillIn, click, visit, currentURL } from "@ember/test-helpers";
+import {
+ fillIn,
+ click,
+ triggerKeyEvent,
+ visit,
+ currentURL,
+} from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance, count } from "discourse/tests/helpers/qunit-helpers";
import siteSettingFixture from "discourse/tests/fixtures/site-settings";
@@ -30,7 +37,7 @@ acceptance("Admin - Site Settings", function (needs) {
updatedTitle = null;
});
- test("upload site setting", async (assert) => {
+ test("upload site setting", async function (assert) {
await visit("/admin/site_settings");
assert.ok(
@@ -41,7 +48,17 @@ acceptance("Admin - Site Settings", function (needs) {
assert.ok(exists(".row.setting.upload .undo"), "undo button is present");
});
- test("changing value updates dirty state", async (assert) => {
+ test("links to staff action log", async function (assert) {
+ await visit("/admin/site_settings");
+
+ assert.equal(
+ queryAll(".row.setting .setting-label h3 a").attr("href"),
+ "/admin/logs/staff_action_logs?filters=%7B%22subject%22%3A%22title%22%2C%22action_name%22%3A%22change_site_setting%22%7D",
+ "it links to the staff action log"
+ );
+ });
+
+ test("changing value updates dirty state", async function (assert) {
await visit("/admin/site_settings");
await fillIn("#setting-filter", " title ");
assert.equal(count(".row.setting"), 1, "filter returns 1 site setting");
@@ -81,14 +98,14 @@ acceptance("Admin - Site Settings", function (needs) {
);
await fillIn(".input-setting-string", "Test");
- await keyEvent(".input-setting-string", "keydown", 13); // enter
+ await triggerKeyEvent(".input-setting-string", "keydown", 13); // enter
assert.ok(
exists(".row.setting.overridden"),
"saving via Enter key marks setting as overriden"
);
});
- test("always shows filtered site settings if a filter is set", async (assert) => {
+ test("always shows filtered site settings if a filter is set", async function (assert) {
await visit("/admin/site_settings");
await fillIn("#setting-filter", "title");
assert.equal(count(".row.setting"), 1);
@@ -102,7 +119,7 @@ acceptance("Admin - Site Settings", function (needs) {
assert.equal(count(".row.setting"), 1);
});
- test("filter settings by plugin name", async (assert) => {
+ test("filter settings by plugin name", async function (assert) {
await visit("/admin/site_settings");
await fillIn("#setting-filter", "plugin:discourse-logo");
@@ -113,7 +130,7 @@ acceptance("Admin - Site Settings", function (needs) {
assert.equal(count(".row.setting"), 0);
});
- test("category name is preserved", async (assert) => {
+ test("category name is preserved", async function (assert) {
await visit("admin/site_settings/category/basic?filter=menu");
assert.equal(
currentURL(),
@@ -121,7 +138,7 @@ acceptance("Admin - Site Settings", function (needs) {
);
});
- test("shows all_results if current category has none", async (assert) => {
+ test("shows all_results if current category has none", async function (assert) {
await visit("admin/site_settings");
await click(".admin-nav .basic a");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js
index cf9d843dbc..4b92cd02d2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-site-text-test.js
@@ -7,7 +7,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Admin - Site Texts", function (needs) {
needs.user();
- test("search for a key", async (assert) => {
+ test("search for a key", async function (assert) {
await visit("/admin/customize/site_texts");
await fillIn(".site-text-search", "Test");
@@ -28,7 +28,7 @@ acceptance("Admin - Site Texts", function (needs) {
assert.ok(exists(".site-text.overridden"));
});
- test("edit and revert a site text by key", async (assert) => {
+ test("edit and revert a site text by key", async function (assert) {
await visit("/admin/customize/site_texts/site.test");
assert.equal(queryAll(".title h3").text(), "site.test");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
index 244af8af9a..a18b723e90 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
@@ -25,7 +25,7 @@ acceptance("Admin - Suspend User", function (needs) {
);
});
- test("suspend a user - cancel", async (assert) => {
+ test("suspend a user - cancel", async function (assert) {
await visit("/admin/users/1234/regular");
await click(".suspend-user");
@@ -36,7 +36,7 @@ acceptance("Admin - Suspend User", function (needs) {
assert.equal(queryAll(".suspend-user-modal:visible").length, 0);
});
- test("suspend a user - cancel with input", async (assert) => {
+ test("suspend a user - cancel with input", async function (assert) {
await visit("/admin/users/1234/regular");
await click(".suspend-user");
@@ -63,7 +63,7 @@ acceptance("Admin - Suspend User", function (needs) {
assert.equal(queryAll(".bootbox.modal:visible").length, 0);
});
- test("suspend, then unsuspend a user", async (assert) => {
+ test("suspend, then unsuspend a user", async function (assert) {
const suspendUntilCombobox = selectKit(".suspend-until .combobox");
await visit("/admin/flags/active");
@@ -83,7 +83,7 @@ acceptance("Admin - Suspend User", function (needs) {
await suspendUntilCombobox.expand();
await suspendUntilCombobox.selectRowByValue("tomorrow");
- await fillIn(".suspend-reason", "for breaking the rules");
+ await fillIn("input.suspend-reason", "for breaking the rules");
await fillIn(".suspend-message", "this is an email reason why");
assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js
index 83ca86f980..7d750e7e93 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-user-badges-test.js
@@ -6,7 +6,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Admin - Users Badges", function (needs) {
needs.user();
- test("lists badges", async (assert) => {
+ test("lists badges", async function (assert) {
await visit("/admin/users/1/eviltrout/badges");
assert.ok(exists(`span[data-badge-name="Badge 8"]`));
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js
index 3a9e081ec7..e8ea730502 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-user-emails-test.js
@@ -35,13 +35,13 @@ function assertMultipleSecondary(assert, firstEmail, secondEmail) {
acceptance("Admin - User Emails", function (needs) {
needs.user();
- test("viewing self without secondary emails", async (assert) => {
+ test("viewing self without secondary emails", async function (assert) {
await visit("/admin/users/1/eviltrout");
assertNoSecondary(assert);
});
- test("viewing self with multiple secondary emails", async (assert) => {
+ test("viewing self with multiple secondary emails", async function (assert) {
await visit("/admin/users/3/markvanlan");
assert.equal(
@@ -57,14 +57,14 @@ acceptance("Admin - User Emails", function (needs) {
);
});
- test("viewing another user with no secondary email", async (assert) => {
+ test("viewing another user with no secondary email", async function (assert) {
await visit("/admin/users/1234/regular");
await click(`.display-row.secondary-emails button`);
assertNoSecondary(assert);
});
- test("viewing another account with secondary emails", async (assert) => {
+ test("viewing another account with secondary emails", async function (assert) {
await visit("/admin/users/1235/regular1");
await click(`.display-row.secondary-emails button`);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
index dad654e177..786bbba702 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
@@ -39,7 +39,7 @@ acceptance("Admin - User Index", function (needs) {
});
});
- test("can edit username", async (assert) => {
+ test("can edit username", async function (assert) {
await visit("/admin/users/2/sam");
assert.equal(queryAll(".display-row.username .value").text().trim(), "sam");
@@ -60,7 +60,7 @@ acceptance("Admin - User Index", function (needs) {
);
});
- test("will clear unsaved groups when switching user", async (assert) => {
+ test("will clear unsaved groups when switching user", async function (assert) {
await visit("/admin/users/2/sam");
assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js
index 8efbf5192a..27b6e45195 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-users-list-test.js
@@ -8,14 +8,14 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Admin - Users List", function (needs) {
needs.user();
- test("lists users", async (assert) => {
+ test("lists users", async function (assert) {
await visit("/admin/users/list/active");
assert.ok(exists(".users-list .user"));
assert.ok(!exists(".user:eq(0) .email small"), "escapes email");
});
- test("sorts users", async (assert) => {
+ test("sorts users", async function (assert) {
await visit("/admin/users/list/active");
assert.ok(exists(".users-list .user"));
@@ -39,7 +39,7 @@ acceptance("Admin - Users List", function (needs) {
);
});
- test("toggles email visibility", async (assert) => {
+ test("toggles email visibility", async function (assert) {
await visit("/admin/users/list/active");
assert.ok(exists(".users-list .user"));
@@ -61,7 +61,7 @@ acceptance("Admin - Users List", function (needs) {
);
});
- test("switching tabs", async (assert) => {
+ test("switching tabs", async function (assert) {
const activeUser = "eviltrout";
const suspectUser = "sam";
const activeTitle = I18n.t("admin.users.titles.active");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js
index ce2b6a258d..fd9e279e2e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/admin-watched-words-test.js
@@ -7,7 +7,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Admin - Watched Words", function (needs) {
needs.user();
- test("list words in groups", async (assert) => {
+ test("list words in groups", async function (assert) {
await visit("/admin/logs/watched_words/action/block");
assert.ok(exists(".watched-words-list"));
@@ -44,7 +44,7 @@ acceptance("Admin - Watched Words", function (needs) {
assert.ok(!exists(".watched-words-list .watched-word"), "Empty word list.");
});
- test("add words", async (assert) => {
+ test("add words", async function (assert) {
await visit("/admin/logs/watched_words/action/block");
click(".show-words-checkbox");
@@ -61,7 +61,7 @@ acceptance("Admin - Watched Words", function (needs) {
assert.equal(found.length, 1);
});
- test("remove words", async (assert) => {
+ test("remove words", async function (assert) {
await visit("/admin/logs/watched_words/action/block");
await click(".show-words-checkbox");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js b/app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js
index 3783f68704..bbc2f71407 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/auth-complete-test.js
@@ -1,5 +1,5 @@
import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { visit, currentRouteName } from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
@@ -20,10 +20,14 @@ acceptance("Auth Complete", function (needs) {
.removeChild(document.getElementById("data-authentication"));
});
- test("when login not required", async (assert) => {
+ test("when login not required", async function (assert) {
await visit("/");
- assert.equal(currentPath(), "discovery.latest", "it stays on the homepage");
+ assert.equal(
+ currentRouteName(),
+ "discovery.latest",
+ "it stays on the homepage"
+ );
assert.ok(
exists("#discourse-modal div.create-account"),
@@ -35,7 +39,7 @@ acceptance("Auth Complete", function (needs) {
this.siteSettings.login_required = true;
await visit("/");
- assert.equal(currentPath(), "login", "it redirects to the login page");
+ assert.equal(currentRouteName(), "login", "it redirects to the login page");
assert.ok(
exists("#discourse-modal div.create-account"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/badges-test.js b/app/assets/javascripts/discourse/tests/acceptance/badges-test.js
index 575259f87c..48837da4c8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/badges-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/badges-test.js
@@ -7,7 +7,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Badges", function (needs) {
needs.user();
- test("Visit Badge Pages", async (assert) => {
+ test("Visit Badge Pages", async function (assert) {
await visit("/badges");
assert.ok($("body.badges-page").length, "has body class");
@@ -20,7 +20,7 @@ acceptance("Badges", function (needs) {
assert.ok(!exists(".badge-card:eq(0) script"));
});
- test("shows correct badge titles to choose from", async (assert) => {
+ test("shows correct badge titles to choose from", async function (assert) {
const availableBadgeTitles = selectKit(".select-kit");
await visit("/badges/50/custombadge");
await availableBadgeTitles.expand();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js b/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
index b4226be962..15a86b3da6 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/bookmarks-test.js
@@ -39,7 +39,7 @@ acceptance("Bookmarking", function (needs) {
);
});
- test("Bookmarks modal opening", async (assert) => {
+ test("Bookmarks modal opening", async function (assert) {
await visit("/t/internationalization-localization/280");
await openBookmarkModal();
assert.ok(
@@ -48,7 +48,7 @@ acceptance("Bookmarking", function (needs) {
);
});
- test("Bookmarks modal selecting reminder type", async (assert) => {
+ test("Bookmarks modal selecting reminder type", async function (assert) {
await visit("/t/internationalization-localization/280");
await openBookmarkModal();
@@ -79,7 +79,7 @@ acceptance("Bookmarking", function (needs) {
]);
});
- test("Saving a bookmark with a reminder", async (assert) => {
+ test("Saving a bookmark with a reminder", async function (assert) {
await visit("/t/internationalization-localization/280");
await openBookmarkModal();
await fillIn("input#bookmark-name", "Check this out later");
@@ -98,7 +98,7 @@ acceptance("Bookmarking", function (needs) {
assert.deepEqual(steps, ["tomorrow"]);
});
- test("Opening the options panel and remembering the option", async (assert) => {
+ test("Opening the options panel and remembering the option", async function (assert) {
await visit("/t/internationalization-localization/280");
await openBookmarkModal();
await click(".bookmark-options-button");
@@ -119,7 +119,7 @@ acceptance("Bookmarking", function (needs) {
assert.deepEqual(steps, ["none"]);
});
- test("Saving a bookmark with no reminder or name", async (assert) => {
+ test("Saving a bookmark with no reminder or name", async function (assert) {
await visit("/t/internationalization-localization/280");
await openBookmarkModal();
await click("#save-bookmark");
@@ -137,7 +137,7 @@ acceptance("Bookmarking", function (needs) {
assert.deepEqual(steps, ["none"]);
});
- test("Deleting a bookmark with a reminder", async (assert) => {
+ test("Deleting a bookmark with a reminder", async function (assert) {
await visit("/t/internationalization-localization/280");
await openBookmarkModal();
await click("#tap_tile_tomorrow");
@@ -169,7 +169,7 @@ acceptance("Bookmarking", function (needs) {
);
});
- test("Cancelling saving a bookmark", async (assert) => {
+ test("Cancelling saving a bookmark", async function (assert) {
await visit("/t/internationalization-localization/280");
await openBookmarkModal();
await click(".d-modal-cancel");
@@ -179,7 +179,7 @@ acceptance("Bookmarking", function (needs) {
);
});
- test("Editing a bookmark", async (assert) => {
+ test("Editing a bookmark", async function (assert) {
await visit("/t/internationalization-localization/280");
let now = moment.tz(loggedInUser().resolvedTimezone(loggedInUser()));
let tomorrow = now.add(1, "day").format("YYYY-MM-DD");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js
index a4b8ab0196..61738d61bb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-banner-test.js
@@ -37,7 +37,7 @@ acceptance("Category Banners", function (needs) {
],
});
- test("Does not display category banners when not set", async (assert) => {
+ test("Does not display category banners when not set", async function (assert) {
await visit("/c/test-read-only-without-banner");
await click("#create-topic");
@@ -48,7 +48,7 @@ acceptance("Category Banners", function (needs) {
);
});
- test("Displays category banners when set", async (assert) => {
+ test("Displays category banners when set", async function (assert) {
await visit("/c/test-read-only-with-banner");
await click("#create-topic");
@@ -85,7 +85,7 @@ acceptance("Anonymous Category Banners", function (needs) {
],
});
- test("Does not display category banners when set", async (assert) => {
+ test("Does not display category banners when set", async function (assert) {
await visit("/c/test-read-only-with-banner");
assert.ok(
!visible(".category-read-only-banner"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-chooser-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-chooser-test.js
index ea61828294..bd7ef8217d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-chooser-test.js
@@ -9,7 +9,7 @@ acceptance("CategoryChooser", function (needs) {
allow_uncategorized_topics: false,
});
- test("does not display uncategorized if not allowed", async (assert) => {
+ test("does not display uncategorized if not allowed", async function (assert) {
const categoryChooser = selectKit(".category-chooser");
await visit("/");
@@ -19,7 +19,7 @@ acceptance("CategoryChooser", function (needs) {
assert.ok(categoryChooser.rowByIndex(0).name() !== "uncategorized");
});
- test("prefill category when category_id is set", async (assert) => {
+ test("prefill category when category_id is set", async function (assert) {
await visit("/new-topic?category_id=1");
assert.equal(selectKit(".category-chooser").header().value(), 1);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js
index cdefbb2d33..00dc3b86bd 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-edit-security-test.js
@@ -7,7 +7,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Category Edit - security", function (needs) {
needs.user();
- test("default", async (assert) => {
+ test("default", async function (assert) {
await visit("/c/bug/edit/security");
const $firstItem = queryAll(".permission-list li:eq(0)");
@@ -19,7 +19,7 @@ acceptance("Category Edit - security", function (needs) {
assert.equal(permission, "Create / Reply / See");
});
- test("removing a permission", async (assert) => {
+ test("removing a permission", async function (assert) {
const availableGroups = selectKit(".available-groups");
await visit("/c/bug/edit/security");
@@ -43,7 +43,7 @@ acceptance("Category Edit - security", function (needs) {
);
});
- test("adding a permission", async (assert) => {
+ test("adding a permission", async function (assert) {
const availableGroups = selectKit(".available-groups");
const permissionSelector = selectKit(".permission-selector");
@@ -67,7 +67,7 @@ acceptance("Category Edit - security", function (needs) {
assert.equal(permission, "Reply / See");
});
- test("adding a previously removed permission", async (assert) => {
+ test("adding a previously removed permission", async function (assert) {
const availableGroups = selectKit(".available-groups");
await visit("/c/bug/edit/security");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
index eb751c85a4..6743a4512e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
@@ -10,7 +10,7 @@ acceptance("Category Edit", function (needs) {
needs.user();
needs.settings({ email_in: true });
- test("Editing the category", async (assert) => {
+ test("Editing the category", async function (assert) {
await visit("/c/bug");
await click("button.edit-category");
@@ -57,7 +57,7 @@ acceptance("Category Edit", function (needs) {
);
});
- test("Index Route", async (assert) => {
+ test("Index Route", async function (assert) {
await visit("/c/bug/edit");
assert.equal(
currentURL(),
@@ -66,7 +66,7 @@ acceptance("Category Edit", function (needs) {
);
});
- test("Slugless Route", async (assert) => {
+ test("Slugless Route", async function (assert) {
await visit("/c/1-category/edit");
assert.equal(
currentURL(),
@@ -76,7 +76,7 @@ acceptance("Category Edit", function (needs) {
assert.equal(queryAll("input.category-name").val(), "bug");
});
- test("Error Saving", async (assert) => {
+ test("Error Saving", async function (assert) {
await visit("/c/bug/edit/settings");
await fillIn(".email-in", "duplicate@example.com");
await click("#save-category");
@@ -88,7 +88,7 @@ acceptance("Category Edit", function (needs) {
assert.ok(!visible(".bootbox"));
});
- test("Subcategory list settings", async (assert) => {
+ test("Subcategory list settings", async function (assert) {
await visit("/c/bug/edit/settings");
assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js b/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js
index 21a85d6533..a2aa793dd9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/category-new-test.js
@@ -9,7 +9,7 @@ import sinon from "sinon";
acceptance("Category New", function (needs) {
needs.user();
- test("Creating a new category", async (assert) => {
+ test("Creating a new category", async function (assert) {
await visit("/new-category");
assert.ok(queryAll(".badge-category"));
@@ -37,12 +37,12 @@ acceptance("Category New", function (needs) {
"it can switch to the settings tab"
);
- sinon.stub(DiscourseURL, "redirectTo");
+ sinon.stub(DiscourseURL, "routeTo");
await click(".category-back");
assert.ok(
- DiscourseURL.redirectTo.calledWith("/c/testing/11"),
- "it full page redirects after a newly created category"
+ DiscourseURL.routeTo.calledWith("/c/testing/11"),
+ "back routing works"
);
});
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/click-track-test.js b/app/assets/javascripts/discourse/tests/acceptance/click-track-test.js
index 5b7b918c07..a0403c39f5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/click-track-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/click-track-test.js
@@ -12,7 +12,7 @@ acceptance("Click Track", function (needs) {
});
});
- test("Do not track mentions", async (assert) => {
+ test("Do not track mentions", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.ok(
queryAll(".user-card.show").length === 0,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
index 3721f16858..19776e45ef 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-actions-test.js
@@ -19,7 +19,7 @@ acceptance("Composer Actions", function (needs) {
needs.settings({ enable_whispers: true });
needs.site({ can_tag_topics: true });
- test("creating new topic and then reply_as_private_message keeps attributes", async (assert) => {
+ test("creating new topic and then reply_as_private_message keeps attributes", async function (assert) {
await visit("/");
await click("button#create-topic");
@@ -34,7 +34,7 @@ acceptance("Composer Actions", function (needs) {
assert.ok(queryAll(".d-editor-input").val(), "this is the reply");
});
- test("replying to post", async (assert) => {
+ test("replying to post", async function (assert) {
const composerActions = selectKit(".composer-actions");
await visit("/t/internationalization-localization/280");
@@ -52,7 +52,7 @@ acceptance("Composer Actions", function (needs) {
assert.equal(composerActions.rowByIndex(5).value(), undefined);
});
- test("replying to post - reply_as_private_message", async (assert) => {
+ test("replying to post - reply_as_private_message", async function (assert) {
const composerActions = selectKit(".composer-actions");
await visit("/t/internationalization-localization/280");
@@ -68,7 +68,7 @@ acceptance("Composer Actions", function (needs) {
);
});
- test("replying to post - reply_to_topic", async (assert) => {
+ test("replying to post - reply_to_topic", async function (assert) {
const composerActions = selectKit(".composer-actions");
await visit("/t/internationalization-localization/280");
@@ -95,7 +95,7 @@ acceptance("Composer Actions", function (needs) {
);
});
- test("replying to post - toggle_whisper", async (assert) => {
+ test("replying to post - toggle_whisper", async function (assert) {
const composerActions = selectKit(".composer-actions");
await visit("/t/internationalization-localization/280");
@@ -113,7 +113,7 @@ acceptance("Composer Actions", function (needs) {
);
});
- test("replying to post - reply_as_new_topic", async (assert) => {
+ test("replying to post - reply_as_new_topic", async function (assert) {
sinon
.stub(Draft, "get")
.returns(Promise.resolve({ draft: "", draft_sequence: 0 }));
@@ -144,7 +144,7 @@ acceptance("Composer Actions", function (needs) {
sinon.restore();
});
- test("reply_as_new_topic without a new_topic draft", async (assert) => {
+ test("reply_as_new_topic without a new_topic draft", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".create.reply");
const composerActions = selectKit(".composer-actions");
@@ -153,7 +153,7 @@ acceptance("Composer Actions", function (needs) {
assert.equal(exists(queryAll(".bootbox")), false);
});
- test("reply_as_new_group_message", async (assert) => {
+ test("reply_as_new_group_message", async function (assert) {
await visit("/t/lorem-ipsum-dolor-sit-amet/130");
await click(".create.reply");
const composerActions = selectKit(".composer-actions");
@@ -168,7 +168,7 @@ acceptance("Composer Actions", function (needs) {
assert.deepEqual(items, ["foo", "foo_group"]);
});
- test("hide component if no content", async (assert) => {
+ test("hide component if no content", async function (assert) {
await visit("/");
await click("button#create-topic");
@@ -184,7 +184,7 @@ acceptance("Composer Actions", function (needs) {
assert.equal(composerActions.rows().length, 2);
});
- test("interactions", async (assert) => {
+ test("interactions", async function (assert) {
const composerActions = selectKit(".composer-actions");
const quote = "Life is like riding a bicycle.";
@@ -265,7 +265,7 @@ acceptance("Composer Actions", function (needs) {
assert.equal(composerActions.rows().length, 3);
});
- test("replying to post - toggle_topic_bump", async (assert) => {
+ test("replying to post - toggle_topic_bump", async function (assert) {
const composerActions = selectKit(".composer-actions");
await visit("/t/internationalization-localization/280");
@@ -293,7 +293,7 @@ acceptance("Composer Actions", function (needs) {
);
});
- test("replying to post as staff", async (assert) => {
+ test("replying to post as staff", async function (assert) {
const composerActions = selectKit(".composer-actions");
updateCurrentUser({ admin: true });
@@ -305,7 +305,7 @@ acceptance("Composer Actions", function (needs) {
assert.equal(composerActions.rowByIndex(4).value(), "toggle_topic_bump");
});
- test("replying to post as TL3 user", async (assert) => {
+ test("replying to post as TL3 user", async function (assert) {
const composerActions = selectKit(".composer-actions");
updateCurrentUser({ moderator: false, admin: false, trust_level: 3 });
@@ -323,7 +323,7 @@ acceptance("Composer Actions", function (needs) {
});
});
- test("replying to post as TL4 user", async (assert) => {
+ test("replying to post as TL4 user", async function (assert) {
const composerActions = selectKit(".composer-actions");
updateCurrentUser({ moderator: false, admin: false, trust_level: 4 });
@@ -335,7 +335,7 @@ acceptance("Composer Actions", function (needs) {
assert.equal(composerActions.rowByIndex(3).value(), "toggle_topic_bump");
});
- test("replying to first post - reply_as_private_message", async (assert) => {
+ test("replying to first post - reply_as_private_message", async function (assert) {
const composerActions = selectKit(".composer-actions");
await visit("/t/internationalization-localization/280");
@@ -351,7 +351,7 @@ acceptance("Composer Actions", function (needs) {
);
});
- test("editing post", async (assert) => {
+ test("editing post", async function (assert) {
const composerActions = selectKit(".composer-actions");
await visit("/t/internationalization-localization/280");
@@ -385,7 +385,7 @@ acceptance("Composer Actions With New Topic Draft", function (needs) {
needs.hooks.beforeEach(() => _clearSnapshots());
needs.hooks.afterEach(() => _clearSnapshots());
- test("shared draft", async (assert) => {
+ test("shared draft", async function (assert) {
stubDraftResponse();
try {
toggleCheckDraftPopup(true);
@@ -427,7 +427,7 @@ acceptance("Composer Actions With New Topic Draft", function (needs) {
sinon.restore();
});
- test("reply_as_new_topic with new_topic draft", async (assert) => {
+ test("reply_as_new_topic with new_topic draft", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".create.reply");
const composerActions = selectKit(".composer-actions");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js
index 519e68b9d2..5ff1f10dc2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-attachment-test.js
@@ -33,7 +33,7 @@ acceptance("Composer Attachment", function (needs) {
needs.user();
needs.pretender(pretender);
- test("attachments are cooked properly", async (assert) => {
+ test("attachments are cooked properly", async function (assert) {
await writeInComposer(assert);
assert.equal(
queryAll(".d-editor-preview:visible").html().trim(),
@@ -47,7 +47,7 @@ acceptance("Composer Attachment - Secure Media Enabled", function (needs) {
needs.settings({ secure_media: true });
needs.pretender(pretender);
- test("attachments are cooked properly when secure media is enabled", async (assert) => {
+ test("attachments are cooked properly when secure media is enabled", async function (assert) {
await writeInComposer(assert);
assert.equal(
queryAll(".d-editor-preview:visible").html().trim(),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js
index 83f637ccf3..31dec2844d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-edit-conflict-test.js
@@ -15,7 +15,7 @@ acceptance("Composer - Edit conflict", function (needs) {
});
});
- test("Edit a post that causes an edit conflict", async (assert) => {
+ test("Edit a post that causes an edit conflict", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".topic-post:eq(0) button.show-more-actions");
await click(".topic-post:eq(0) button.edit");
@@ -33,7 +33,7 @@ acceptance("Composer - Edit conflict", function (needs) {
await click(".modal .btn-primary");
});
- test("Should not send originalText when posting a new reply", async (assert) => {
+ test("Should not send originalText when posting a new reply", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".topic-post:eq(0) button.reply");
await fillIn(
@@ -43,7 +43,7 @@ acceptance("Composer - Edit conflict", function (needs) {
assert.ok(lastBody.indexOf("originalText") === -1);
});
- test("Should send originalText when editing a reply", async (assert) => {
+ test("Should send originalText when editing a reply", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".topic-post:eq(0) button.show-more-actions");
await click(".topic-post:eq(0) button.edit");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js
index 425285ac38..2878445b8a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js
@@ -1,13 +1,13 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { click, fillIn, visit } from "@ember/test-helpers";
+import { click, fillIn, triggerKeyEvent, visit } from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Composer - Hyperlink", function (needs) {
needs.user();
- test("add a hyperlink to a reply", async (assert) => {
+ test("add a hyperlink to a reply", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".topic-post:first-child button.reply");
await fillIn(".d-editor-input", "This is a link to ");
@@ -71,21 +71,21 @@ acceptance("Composer - Hyperlink", function (needs) {
await click(".d-editor button.link");
await fillIn(".modal-body .link-url", "http://google.com");
- await keyEvent(".modal-body .link-url", "keyup", 32);
+ await triggerKeyEvent(".modal-body .link-url", "keyup", 32);
assert.ok(
!exists(".internal-link-results"),
"does not show internal links search dropdown when inputting a url"
);
await fillIn(".modal-body .link-url", "local");
- await keyEvent(".modal-body .link-url", "keyup", 32);
+ await triggerKeyEvent(".modal-body .link-url", "keyup", 32);
assert.ok(
exists(".internal-link-results"),
"shows internal links search dropdown when entering keywords"
);
- await keyEvent(".insert-link", "keydown", 40);
- await keyEvent(".insert-link", "keydown", 13);
+ await triggerKeyEvent(".insert-link", "keydown", 40);
+ await triggerKeyEvent(".insert-link", "keydown", 13);
assert.ok(
!exists(".internal-link-results"),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js
index ee0c0d7df1..8f44224452 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-onebox-test.js
@@ -10,7 +10,7 @@ acceptance("Composer - Onebox", function (needs) {
enable_markdown_linkify: true,
});
- test("Preview update should respect max_oneboxes_per_post site setting", async (assert) => {
+ test("Preview update should respect max_oneboxes_per_post site setting", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-tags-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-tags-test.js
index 2b2cbe1b3d..47feb7c70a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-tags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-tags-test.js
@@ -16,7 +16,7 @@ acceptance("Composer - Tags", function (needs) {
});
needs.site({ can_tag_topics: true });
- test("staff bypass tag validation rule", async (assert) => {
+ test("staff bypass tag validation rule", async function (assert) {
await visit("/");
await click("#create-topic");
@@ -33,7 +33,7 @@ acceptance("Composer - Tags", function (needs) {
assert.notEqual(currentURL(), "/");
});
- test("users do not bypass tag validation rule", async (assert) => {
+ test("users do not bypass tag validation rule", async function (assert) {
await visit("/");
await click("#create-topic");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
index 8e0919e0a6..08277cfa32 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-test.js
@@ -24,7 +24,7 @@ acceptance("Composer", function (needs) {
});
});
- skip("Tests the Composer controls", async (assert) => {
+ skip("Tests the Composer controls", async function (assert) {
await visit("/");
assert.ok(exists("#create-topic"), "the create button is visible");
@@ -102,7 +102,7 @@ acceptance("Composer", function (needs) {
assert.ok(!exists(".bootbox.modal"), "the confirmation can be cancelled");
});
- test("Composer upload placeholder", async (assert) => {
+ test("Composer upload placeholder", async function (assert) {
await visit("/");
await click("#create-topic");
@@ -198,7 +198,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Create a topic with server side errors", async (assert) => {
+ test("Create a topic with server side errors", async function (assert) {
await visit("/");
await click("#create-topic");
await fillIn("#reply-title", "this title triggers an error");
@@ -210,7 +210,7 @@ acceptance("Composer", function (needs) {
assert.ok(exists(".d-editor-input"), "the composer input is visible");
});
- test("Create a Topic", async (assert) => {
+ test("Create a Topic", async function (assert) {
await visit("/");
await click("#create-topic");
await fillIn("#reply-title", "Internationalization Localization");
@@ -226,7 +226,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Create an enqueued Topic", async (assert) => {
+ test("Create an enqueued Topic", async function (assert) {
await visit("/");
await click("#create-topic");
await fillIn("#reply-title", "Internationalization Localization");
@@ -239,7 +239,7 @@ acceptance("Composer", function (needs) {
assert.ok(invisible(".d-modal"), "the modal can be dismissed");
});
- test("Can display a message and route to a URL", async (assert) => {
+ test("Can display a message and route to a URL", async function (assert) {
await visit("/");
await click("#create-topic");
await fillIn("#reply-title", "This title doesn't matter");
@@ -259,7 +259,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Create a Reply", async (assert) => {
+ test("Create a Reply", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.ok(
@@ -282,7 +282,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Can edit a post after starting a reply", async (assert) => {
+ test("Can edit a post after starting a reply", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .create");
@@ -291,16 +291,16 @@ acceptance("Composer", function (needs) {
await click(".topic-post:eq(0) button.show-more-actions");
await click(".topic-post:eq(0) button.edit");
- await click("a[data-handler='0']");
+ await click(".modal-footer button:eq(1)");
- assert.ok(!visible(".bootbox.modal"));
+ assert.ok(!visible(".discard-draft-modal.modal"));
assert.equal(
queryAll(".d-editor-input").val(),
"this is the content of my reply"
);
});
- test("Posting on a different topic", async (assert) => {
+ test("Posting on a different topic", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
await fillIn(
@@ -320,7 +320,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Create an enqueued Reply", async (assert) => {
+ test("Create an enqueued Reply", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.notOk(queryAll(".pending-posts .reviewable-item").length);
@@ -347,7 +347,7 @@ acceptance("Composer", function (needs) {
assert.ok(queryAll(".pending-posts .reviewable-item").length);
});
- test("Edit the first post", async (assert) => {
+ test("Edit the first post", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.ok(
@@ -385,7 +385,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Composer can switch between edits", async (assert) => {
+ test("Composer can switch between edits", async function (assert) {
await visit("/t/this-is-a-test-topic/9");
await click(".topic-post:eq(0) button.edit");
@@ -402,15 +402,18 @@ acceptance("Composer", function (needs) {
);
});
- test("Composer with dirty edit can toggle to another edit", async (assert) => {
+ test("Composer with dirty edit can toggle to another edit", async function (assert) {
await visit("/t/this-is-a-test-topic/9");
await click(".topic-post:eq(0) button.edit");
await fillIn(".d-editor-input", "This is a dirty reply");
await click(".topic-post:eq(1) button.edit");
- assert.ok(exists(".bootbox.modal"), "it pops up a confirmation dialog");
+ assert.ok(
+ exists(".discard-draft-modal.modal"),
+ "it pops up a confirmation dialog"
+ );
- await click(".modal-footer a:eq(0)");
+ await click(".modal-footer button:eq(0)");
assert.equal(
queryAll(".d-editor-input").val().indexOf("This is the second post."),
0,
@@ -418,7 +421,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Composer can toggle between edit and reply", async (assert) => {
+ test("Composer can toggle between edit and reply", async function (assert) {
await visit("/t/this-is-a-test-topic/9");
await click(".topic-post:eq(0) button.edit");
@@ -437,7 +440,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Composer can toggle whispers", async (assert) => {
+ test("Composer can toggle whispers", async function (assert) {
const menu = selectKit(".toolbar-popup-menu-options");
await visit("/t/this-is-a-test-topic/9");
@@ -472,7 +475,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Composer can toggle layouts (open, fullscreen and draft)", async (assert) => {
+ test("Composer can toggle layouts (open, fullscreen and draft)", async function (assert) {
await visit("/t/this-is-a-test-topic/9");
await click(".topic-post:eq(0) button.reply");
@@ -511,7 +514,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Composer can toggle between reply and createTopic", async (assert) => {
+ test("Composer can toggle between reply and createTopic", async function (assert) {
await visit("/t/this-is-a-test-topic/9");
await click(".topic-post:eq(0) button.reply");
@@ -557,14 +560,17 @@ acceptance("Composer", function (needs) {
);
});
- test("Composer with dirty reply can toggle to edit", async (assert) => {
+ test("Composer with dirty reply can toggle to edit", async function (assert) {
await visit("/t/this-is-a-test-topic/9");
await click(".topic-post:eq(0) button.reply");
await fillIn(".d-editor-input", "This is a dirty reply");
await click(".topic-post:eq(0) button.edit");
- assert.ok(exists(".bootbox.modal"), "it pops up a confirmation dialog");
- await click(".modal-footer a:eq(0)");
+ assert.ok(
+ exists(".discard-draft-modal.modal"),
+ "it pops up a confirmation dialog"
+ );
+ await click(".modal-footer button:eq(0)");
assert.equal(
queryAll(".d-editor-input").val().indexOf("This is the first post."),
0,
@@ -572,19 +578,22 @@ acceptance("Composer", function (needs) {
);
});
- test("Composer draft with dirty reply can toggle to edit", async (assert) => {
+ test("Composer draft with dirty reply can toggle to edit", async function (assert) {
await visit("/t/this-is-a-test-topic/9");
await click(".topic-post:eq(0) button.reply");
await fillIn(".d-editor-input", "This is a dirty reply");
await click(".toggler");
await click(".topic-post:eq(1) button.edit");
- assert.ok(exists(".bootbox.modal"), "it pops up a confirmation dialog");
+ assert.ok(
+ exists(".discard-draft-modal.modal"),
+ "it pops up a confirmation dialog"
+ );
assert.equal(
- queryAll(".modal-footer a:eq(1)").text(),
+ queryAll(".modal-footer button:eq(1)").text().trim(),
I18n.t("post.abandon.no_value")
);
- await click(".modal-footer a:eq(0)");
+ await click(".modal-footer button:eq(0)");
assert.equal(
queryAll(".d-editor-input").val().indexOf("This is the second post."),
0,
@@ -592,7 +601,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Composer draft can switch to draft in new context without destroying current draft", async (assert) => {
+ test("Composer draft can switch to draft in new context without destroying current draft", async function (assert) {
await visit("/t/this-is-a-test-topic/9");
await click(".topic-post:eq(0) button.reply");
@@ -601,12 +610,15 @@ acceptance("Composer", function (needs) {
await click("#site-logo");
await click("#create-topic");
- assert.ok(exists(".bootbox.modal"), "it pops up a confirmation dialog");
+ assert.ok(
+ exists(".discard-draft-modal.modal"),
+ "it pops up a confirmation dialog"
+ );
assert.equal(
- queryAll(".modal-footer a:eq(1)").text(),
+ queryAll(".modal-footer button:eq(1)").text().trim(),
I18n.t("post.abandon.no_save_draft")
);
- await click(".modal-footer a:eq(1)");
+ await click(".modal-footer button:eq(1)");
assert.equal(
queryAll(".d-editor-input").val(),
"",
@@ -614,7 +626,7 @@ acceptance("Composer", function (needs) {
);
});
- test("Checks for existing draft", async (assert) => {
+ test("Checks for existing draft", async function (assert) {
try {
toggleCheckDraftPopup(true);
@@ -634,7 +646,7 @@ acceptance("Composer", function (needs) {
}
});
- test("Can switch states without abandon popup", async (assert) => {
+ test("Can switch states without abandon popup", async function (assert) {
try {
toggleCheckDraftPopup(true);
@@ -684,7 +696,7 @@ acceptance("Composer", function (needs) {
sinon.restore();
});
- test("Loading draft also replaces the recipients", async (assert) => {
+ test("Loading draft also replaces the recipients", async function (assert) {
try {
toggleCheckDraftPopup(true);
@@ -706,7 +718,7 @@ acceptance("Composer", function (needs) {
}
});
- test("Deleting the text content of the first post in a private message", async (assert) => {
+ test("Deleting the text content of the first post in a private message", async function (assert) {
await visit("/t/34");
await click("#post_1 .d-icon-ellipsis-h");
@@ -730,7 +742,7 @@ acceptance("Composer", function (needs) {
);
};
- test("Image resizing buttons", async (assert) => {
+ test("Image resizing buttons", async function (assert) {
await visit("/");
await click("#create-topic");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js
index a918ebdc33..ace51f6bcd 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-topic-links-test.js
@@ -12,7 +12,7 @@ acceptance("Composer topic featured links", function (needs) {
enable_markdown_linkify: true,
});
- test("onebox with title", async (assert) => {
+ test("onebox with title", async function (assert) {
await visit("/");
await click("#create-topic");
await fillIn("#reply-title", "http://www.example.com/has-title.html");
@@ -31,7 +31,7 @@ acceptance("Composer topic featured links", function (needs) {
);
});
- test("onebox result doesn't include a title", async (assert) => {
+ test("onebox result doesn't include a title", async function (assert) {
await visit("/");
await click("#create-topic");
await fillIn("#reply-title", "http://www.example.com/no-title.html");
@@ -50,7 +50,7 @@ acceptance("Composer topic featured links", function (needs) {
);
});
- test("no onebox result", async (assert) => {
+ test("no onebox result", async function (assert) {
await visit("/");
await click("#create-topic");
await fillIn("#reply-title", "http://www.example.com/nope-onebox.html");
@@ -69,7 +69,7 @@ acceptance("Composer topic featured links", function (needs) {
);
});
- test("ignore internal links", async (assert) => {
+ test("ignore internal links", async function (assert) {
await visit("/");
await click("#create-topic");
const title = "http://" + window.location.hostname + "/internal-page.html";
@@ -91,7 +91,7 @@ acceptance("Composer topic featured links", function (needs) {
);
});
- test("link is longer than max title length", async (assert) => {
+ test("link is longer than max title length", async function (assert) {
await visit("/");
await click("#create-topic");
await fillIn(
@@ -113,7 +113,7 @@ acceptance("Composer topic featured links", function (needs) {
);
});
- test("onebox with title but extra words in title field", async (assert) => {
+ test("onebox with title but extra words in title field", async function (assert) {
await visit("/");
await click("#create-topic");
await fillIn("#reply-title", "http://www.example.com/has-title.html test");
@@ -146,7 +146,7 @@ acceptance(
allow_uncategorized_topics: false,
});
- test("Pasting a link enables the text input area", async (assert) => {
+ test("Pasting a link enables the text input area", async function (assert) {
await visit("/");
await click("#create-topic");
assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js
index 94663d2df0..c58ce1855f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/composer-uncategorized-test.js
@@ -14,7 +14,7 @@ acceptance(
allow_uncategorized_topics: false,
});
- test("Disable body until category is selected", async (assert) => {
+ test("Disable body until category is selected", async function (assert) {
await visit("/");
await click("#create-topic");
assert.ok(exists(".d-editor-input"), "the composer input is visible");
@@ -80,7 +80,7 @@ acceptance(
},
],
});
- test("Enable composer/body if no topic templates present", async (assert) => {
+ test("Enable composer/body if no topic templates present", async function (assert) {
await visit("/");
await click("#create-topic");
assert.ok(exists(".d-editor-input"), "the composer input is visible");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js
index f74626bb11..03a3b280bc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/create-account-external-test.js
@@ -21,7 +21,7 @@ acceptance("Create Account - external auth", function (needs) {
.removeChild(document.getElementById("data-authentication"));
});
- test("when skip is disabled (default)", async (assert) => {
+ test("when skip is disabled (default)", async function (assert) {
await visit("/");
assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js b/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
index 1d5e5f2848..66785ccf3d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/create-account-user-fields-test.js
@@ -28,7 +28,7 @@ acceptance("Create Account - User Fields", function (needs) {
],
});
- test("create account with user fields", async (assert) => {
+ test("create account with user fields", async function (assert) {
await visit("/");
await click("header .sign-up-button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js b/app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js
index afde1c0ff6..fc107c14d8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/custom-html-set-test.js
@@ -7,12 +7,12 @@ import { setCustomHTML } from "discourse/helpers/custom-html";
import PreloadStore from "discourse/lib/preload-store";
acceptance("CustomHTML set", function () {
- test("has no custom HTML in the top", async (assert) => {
+ test("has no custom HTML in the top", async function (assert) {
await visit("/static/faq");
assert.ok(!exists("span.custom-html-test"), "it has no markup");
});
- test("renders set HTML", async (assert) => {
+ test("renders set HTML", async function (assert) {
setCustomHTML("top", '
HTML ');
await visit("/static/faq");
@@ -23,7 +23,7 @@ acceptance("CustomHTML set", function () {
);
});
- test("renders preloaded HTML", async (assert) => {
+ test("renders preloaded HTML", async function (assert) {
PreloadStore.store("customHTML", {
top: "
monster ",
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
index e8f58c12da..ce10631ae9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js
@@ -14,7 +14,7 @@ acceptance("CustomHTML template", function (needs) {
delete Ember.TEMPLATES["top"];
});
- test("renders custom template", async (assert) => {
+ test("renders custom template", async function (assert) {
await visit("/static/faq");
assert.equal(
queryAll("span.top-span").text(),
diff --git a/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js b/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js
index bf4269d963..0ce5b65de0 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/dashboard-test.js
@@ -24,13 +24,13 @@ acceptance("Dashboard", function (needs) {
],
});
- test("default", async (assert) => {
+ test("default", async function (assert) {
await visit("/admin");
assert.ok(exists(".dashboard"), "has dashboard-next class");
});
- test("tabs", async (assert) => {
+ test("tabs", async function (assert) {
await visit("/admin");
assert.ok(exists(".dashboard .navigation-item.general"), "general tab");
@@ -42,7 +42,7 @@ acceptance("Dashboard", function (needs) {
assert.ok(exists(".dashboard .navigation-item.reports"), "reports tab");
});
- test("general tab", async (assert) => {
+ test("general tab", async function (assert) {
await visit("/admin");
assert.ok(exists(".admin-report.signups"), "signups report");
assert.ok(exists(".admin-report.posts"), "posts report");
@@ -65,7 +65,7 @@ acceptance("Dashboard", function (needs) {
);
});
- test("activity metrics", async (assert) => {
+ test("activity metrics", async function (assert) {
await visit("/admin");
assert.ok(exists(".admin-report.page-view-total-reqs .today-count"));
@@ -74,7 +74,7 @@ acceptance("Dashboard", function (needs) {
assert.ok(exists(".admin-report.page-view-total-reqs .thirty-days-count"));
});
- test("reports tab", async (assert) => {
+ test("reports tab", async function (assert) {
await visit("/admin");
await click(".dashboard .navigation-item.reports .navigation-link");
@@ -112,7 +112,7 @@ acceptance("Dashboard", function (needs) {
);
});
- test("reports filters", async (assert) => {
+ test("reports filters", async function (assert) {
await visit(
'/admin/reports/signups_with_groups?end_date=2018-07-16&filters=%7B"group"%3A88%7D&start_date=2018-06-16'
);
@@ -131,7 +131,7 @@ acceptance("Dashboard: dashboard_visible_tabs", function (needs) {
needs.user();
needs.settings({ dashboard_visible_tabs: "general|security|reports" });
- test("visible tabs", async (assert) => {
+ test("visible tabs", async function (assert) {
await visit("/admin");
assert.ok(exists(".dashboard .navigation-item.general"), "general tab");
@@ -151,7 +151,7 @@ acceptance("Dashboard: dashboard_hidden_reports", function (needs) {
dashboard_hidden_reports: "posts|dau_by_mau",
});
- test("hidden reports", async (assert) => {
+ test("hidden reports", async function (assert) {
await visit("/admin");
assert.ok(exists(".admin-report.signups.is-visible"), "signups report");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js b/app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js
index 5fc9ba7146..6c8c5c05a4 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/emoji-picker-test.js
@@ -15,7 +15,7 @@ acceptance("EmojiPicker", function (needs) {
this.emojiStore.reset();
});
- test("emoji picker can be opened/closed", async (assert) => {
+ test("emoji picker can be opened/closed", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
@@ -26,7 +26,7 @@ acceptance("EmojiPicker", function (needs) {
assert.notOk(exists(".emoji-picker.opened"), "it closes the picker");
});
- test("emoji picker triggers event when picking emoji", async (assert) => {
+ test("emoji picker triggers event when picking emoji", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
await click("button.emoji.btn");
@@ -39,7 +39,7 @@ acceptance("EmojiPicker", function (needs) {
);
});
- test("emoji picker adds leading whitespace before emoji", async (assert) => {
+ test("emoji picker adds leading whitespace before emoji", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
@@ -64,7 +64,7 @@ acceptance("EmojiPicker", function (needs) {
);
});
- test("emoji picker has a list of recently used emojis", async (assert) => {
+ test("emoji picker has a list of recently used emojis", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
await click("button.emoji.btn");
@@ -102,7 +102,7 @@ acceptance("EmojiPicker", function (needs) {
);
});
- test("emoji picker correctly orders recently used emojis", async (assert) => {
+ test("emoji picker correctly orders recently used emojis", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
await click("button.emoji.btn");
@@ -125,7 +125,7 @@ acceptance("EmojiPicker", function (needs) {
);
});
- test("emoji picker persists state", async (assert) => {
+ test("emoji picker persists state", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
await click("button.emoji.btn");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/emoji-test.js b/app/assets/javascripts/discourse/tests/acceptance/emoji-test.js
index 660db5a718..c56702807d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/emoji-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/emoji-test.js
@@ -7,7 +7,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Emoji", function (needs) {
needs.user();
- test("emoji is cooked properly", async (assert) => {
+ test("emoji is cooked properly", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
@@ -18,7 +18,7 @@ acceptance("Emoji", function (needs) {
);
});
- test("skin toned emoji is cooked properly", async (assert) => {
+ test("skin toned emoji is cooked properly", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js b/app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js
index f6b240ef2d..9695c696f5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/encoded-category-test.js
@@ -43,7 +43,7 @@ acceptance("Encoded Sub Category Discovery", function (needs) {
);
});
- test("Visit subcategory by slug", async (assert) => {
+ test("Visit subcategory by slug", async function (assert) {
let bodySelector =
"body.category-\\%E6\\%BC\\%A2\\%E5\\%AD\\%97-parent-\\%E6\\%BC\\%A2\\%E5\\%AD\\%97-subcategory";
await visit("/c/%E6%BC%A2%E5%AD%97-parent/%E6%BC%A2%E5%AD%97-subcategory");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
index d2a7de19f9..e4b5a84f73 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/flag-post-test.js
@@ -82,13 +82,13 @@ acceptance("flagging", function (needs) {
});
});
- test("Flag modal opening", async (assert) => {
+ test("Flag modal opening", async function (assert) {
await visit("/t/internationalization-localization/280");
await openFlagModal();
assert.ok(exists(".flag-modal-body"), "it shows the flag modal");
});
- test("Flag take action dropdown exists", async (assert) => {
+ test("Flag take action dropdown exists", async function (assert) {
await visit("/t/internationalization-localization/280");
await openFlagModal();
await click("#radio_inappropriate");
@@ -101,7 +101,7 @@ acceptance("flagging", function (needs) {
assert.ok(exists(".silence-user-modal"), "it shows the silence modal");
});
- test("Can silence from take action", async (assert) => {
+ test("Can silence from take action", async function (assert) {
await visit("/t/internationalization-localization/280");
await openFlagModal();
await click("#radio_inappropriate");
@@ -116,7 +116,7 @@ acceptance("flagging", function (needs) {
assert.equal(queryAll(".bootbox.modal:visible").length, 0);
});
- test("Gets dismissable warning from canceling incomplete silence from take action", async (assert) => {
+ test("Gets dismissable warning from canceling incomplete silence from take action", async function (assert) {
await visit("/t/internationalization-localization/280");
await openFlagModal();
await click("#radio_inappropriate");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js b/app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js
index 6a34f91319..afc3cfd2d9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/forgot-password-test.js
@@ -16,7 +16,7 @@ acceptance("Forgot password", function (needs) {
});
});
- test("requesting password reset", async (assert) => {
+ test("requesting password reset", async function (assert) {
await visit("/");
await click("header .login-button");
await click("#forgot-password-link");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
index 3d26edbb74..3c310d1bad 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-index-test.js
@@ -9,7 +9,7 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
acceptance("Group Members - Anonymous", function () {
- test("Viewing Members as anon user", async (assert) => {
+ test("Viewing Members as anon user", async function (assert) {
await visit("/g/discourse");
assert.ok(
@@ -34,7 +34,7 @@ acceptance("Group Members - Anonymous", function () {
acceptance("Group Members", function (needs) {
needs.user();
- test("Viewing Members as a group owner", async (assert) => {
+ test("Viewing Members as a group owner", async function (assert) {
updateCurrentUser({ moderator: false, admin: false });
await visit("/g/discourse");
@@ -47,7 +47,7 @@ acceptance("Group Members", function (needs) {
);
});
- test("Viewing Members as an admin user", async (assert) => {
+ test("Viewing Members as an admin user", async function (assert) {
await visit("/g/discourse");
assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js
index e2a823a27e..9134746b60 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-categories-test.js
@@ -8,7 +8,7 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
acceptance("Managing Group Category Notification Defaults", function () {
- test("As an anonymous user", async (assert) => {
+ test("As an anonymous user", async function (assert) {
await visit("/g/discourse/manage/categories");
assert.ok(
@@ -20,7 +20,7 @@ acceptance("Managing Group Category Notification Defaults", function () {
acceptance("Managing Group Category Notification Defaults", function (needs) {
needs.user();
- test("As an admin", async (assert) => {
+ test("As an admin", async function (assert) {
await visit("/g/discourse/manage/categories");
assert.ok(
@@ -29,7 +29,7 @@ acceptance("Managing Group Category Notification Defaults", function (needs) {
);
});
- test("As a group owner", async (assert) => {
+ test("As a group owner", async function (assert) {
updateCurrentUser({ moderator: false, admin: false });
await visit("/g/discourse/manage/categories");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js
index e06f5a44bf..d6ef207055 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-interaction-test.js
@@ -10,7 +10,7 @@ acceptance("Managing Group Interaction Settings", function (needs) {
needs.user();
needs.settings({ email_in: true });
- test("As an admin", async (assert) => {
+ test("As an admin", async function (assert) {
updateCurrentUser({
moderator: false,
admin: true,
@@ -50,7 +50,7 @@ acceptance("Managing Group Interaction Settings", function (needs) {
);
});
- test("As a group owner", async (assert) => {
+ test("As a group owner", async function (assert) {
updateCurrentUser({
moderator: false,
admin: false,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js
index 9962fa6961..ae04d2c584 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-logs-test.js
@@ -94,7 +94,7 @@ acceptance("Group logs", function (needs) {
});
});
- test("Browsing group logs", async (assert) => {
+ test("Browsing group logs", async function (assert) {
await visit("/g/snorlax/manage/logs");
assert.ok(
queryAll("tr.group-manage-logs-row").length === 2,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js
index bfb85261f3..d35a04db35 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-membership-test.js
@@ -10,7 +10,7 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
acceptance("Managing Group Membership", function (needs) {
needs.user();
- test("As an admin", async (assert) => {
+ test("As an admin", async function (assert) {
updateCurrentUser({ can_create_group: true });
await visit("/g/alternative-group/manage/membership");
@@ -79,7 +79,7 @@ acceptance("Managing Group Membership", function (needs) {
assert.equal(emailDomains.header().value(), "foo.com");
});
- test("As a group owner", async (assert) => {
+ test("As a group owner", async function (assert) {
updateCurrentUser({ moderator: false, admin: false });
await visit("/g/discourse/manage/membership");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js
index b250f941d7..5a68938e00 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-profile-test.js
@@ -8,7 +8,7 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
acceptance("Managing Group Profile", function () {
- test("As an anonymous user", async (assert) => {
+ test("As an anonymous user", async function (assert) {
await visit("/g/discourse/manage/profile");
assert.ok(
@@ -21,7 +21,7 @@ acceptance("Managing Group Profile", function () {
acceptance("Managing Group Profile", function (needs) {
needs.user();
- test("As an admin", async (assert) => {
+ test("As an admin", async function (assert) {
await visit("/g/discourse/manage/profile");
assert.ok(
@@ -42,7 +42,7 @@ acceptance("Managing Group Profile", function (needs) {
);
});
- test("As a group owner", async (assert) => {
+ test("As a group owner", async function (assert) {
updateCurrentUser({
moderator: false,
admin: false,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js
index 9f204d9a62..f5a8cfc716 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-manage-tags-test.js
@@ -8,7 +8,7 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
acceptance("Managing Group Tag Notification Defaults", function () {
- test("As an anonymous user", async (assert) => {
+ test("As an anonymous user", async function (assert) {
await visit("/g/discourse/manage/tags");
assert.ok(
@@ -21,7 +21,7 @@ acceptance("Managing Group Tag Notification Defaults", function () {
acceptance("Managing Group Tag Notification Defaults", function (needs) {
needs.user();
- test("As an admin", async (assert) => {
+ test("As an admin", async function (assert) {
await visit("/g/discourse/manage/tags");
assert.ok(
@@ -30,7 +30,7 @@ acceptance("Managing Group Tag Notification Defaults", function (needs) {
);
});
- test("As a group owner", async (assert) => {
+ test("As a group owner", async function (assert) {
updateCurrentUser({ moderator: false, admin: false });
await visit("/g/discourse/manage/tags");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
index d51e715636..2d847bdb77 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-requests-test.js
@@ -83,7 +83,7 @@ acceptance("Group Requests", function (needs) {
});
});
- test("Group Requests", async (assert) => {
+ test("Group Requests", async function (assert) {
await visit("/g/Macdonald/requests");
assert.equal(queryAll(".group-members tr").length, 2);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
index 10c304104b..5ecf61bb90 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
@@ -76,7 +76,7 @@ acceptance("Group - Anonymous", function (needs) {
);
});
- test("Anonymous Viewing Automatic Group", async (assert) => {
+ test("Anonymous Viewing Automatic Group", async function (assert) {
await visit("/g/moderators");
assert.equal(
@@ -185,7 +185,7 @@ acceptance("Group - Authenticated", function (needs) {
);
});
- test("User Viewing Group", async (assert) => {
+ test("User Viewing Group", async function (assert) {
await visit("/g");
await click(".group-index-request");
@@ -218,7 +218,7 @@ acceptance("Group - Authenticated", function (needs) {
);
});
- test("Admin viewing group messages when there are no messages", async (assert) => {
+ test("Admin viewing group messages when there are no messages", async function (assert) {
await visit("/g/alternative-group");
await click(".nav-pills li a[title='Messages']");
@@ -229,7 +229,7 @@ acceptance("Group - Authenticated", function (needs) {
);
});
- test("Admin viewing group messages", async (assert) => {
+ test("Admin viewing group messages", async function (assert) {
await visit("/g/discourse");
await click(".nav-pills li a[title='Messages']");
@@ -240,7 +240,7 @@ acceptance("Group - Authenticated", function (needs) {
);
});
- test("Admin Viewing Group", async (assert) => {
+ test("Admin Viewing Group", async function (assert) {
await visit("/g/discourse");
assert.ok(
@@ -260,7 +260,7 @@ acceptance("Group - Authenticated", function (needs) {
);
});
- test("Moderator Viewing Group", async (assert) => {
+ test("Moderator Viewing Group", async function (assert) {
await visit("/g/alternative-group");
assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/groups-index-test.js b/app/assets/javascripts/discourse/tests/acceptance/groups-index-test.js
index cda15526a7..b44f36170e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/groups-index-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/groups-index-test.js
@@ -9,7 +9,7 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
acceptance("Groups", function () {
- test("Browsing Groups", async (assert) => {
+ test("Browsing Groups", async function (assert) {
await visit("/g?username=eviltrout");
assert.equal(count(".group-box"), 1, "it displays user's groups");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/groups-new-test.js b/app/assets/javascripts/discourse/tests/acceptance/groups-new-test.js
index 7bc7477397..54910a26e2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/groups-new-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/groups-new-test.js
@@ -5,7 +5,7 @@ import I18n from "I18n";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("New Group - Anonymous", function () {
- test("As an anon user", async (assert) => {
+ test("As an anon user", async function (assert) {
await visit("/g");
assert.equal(
@@ -18,7 +18,7 @@ acceptance("New Group - Anonymous", function () {
acceptance("New Group - Authenticated", function (needs) {
needs.user();
- test("Creating a new group", async (assert) => {
+ test("Creating a new group", async function (assert) {
await visit("/g");
await click(".groups-header-new");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
index 9cb1c2cdc8..86fc7f53f5 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/hamburger-menu-test.js
@@ -13,7 +13,7 @@ acceptance("Opening the hamburger menu with some reviewables", function (
needs.pretender((server, helper) => {
server.get("/review/count.json", () => helper.response({ count: 3 }));
});
- test("As a staff member", async (assert) => {
+ test("As a staff member", async function (assert) {
updateCurrentUser({ moderator: true, admin: false });
await visit("/");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/hashtags-test.js b/app/assets/javascripts/discourse/tests/acceptance/hashtags-test.js
index 3907dd352a..83b29950ca 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/hashtags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/hashtags-test.js
@@ -18,7 +18,7 @@ acceptance("Category and Tag Hashtags", function (needs) {
});
});
- test("hashtags are cooked properly", async (assert) => {
+ test("hashtags are cooked properly", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-buttons .btn.create");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
index 89a7a7bc72..64927d05af 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/invite-accept-test.js
@@ -8,7 +8,7 @@ import PreloadStore from "discourse/lib/preload-store";
acceptance("Invite Accept", function (needs) {
needs.settings({ full_name_required: true });
- test("Invite Acceptance Page", async (assert) => {
+ test("Invite Acceptance Page", async function (assert) {
PreloadStore.store("invite_info", {
invited_by: {
id: 123,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js b/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js
index 97c9001762..9a14943854 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/invite-show-user-fields-test.js
@@ -28,7 +28,7 @@ acceptance("Accept Invite - User Fields", function (needs) {
],
});
- test("accept invite with user fields", async (assert) => {
+ test("accept invite with user fields", async function (assert) {
PreloadStore.store("invite_info", {
invited_by: {
id: 123,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/jump-to-test.js b/app/assets/javascripts/discourse/tests/acceptance/jump-to-test.js
index 30be0a2406..48058d1523 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/jump-to-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/jump-to-test.js
@@ -21,7 +21,7 @@ acceptance("Jump to", function (needs) {
});
});
- test("default", async (assert) => {
+ test("default", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("nav#topic-progress .nums");
await click("button.jump-to-post");
@@ -38,7 +38,7 @@ acceptance("Jump to", function (needs) {
);
});
- test("invalid date", async (assert) => {
+ test("invalid date", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("nav#topic-progress .nums");
await click("button.jump-to-post");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js b/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js
index a86810b0b8..f9bdf7bd58 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js
@@ -1,4 +1,4 @@
-import { visit, currentURL } from "@ember/test-helpers";
+import { triggerKeyEvent, visit, currentURL } from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
@@ -23,21 +23,21 @@ acceptance("Keyboard Shortcuts", function (needs) {
});
});
- test("go to first suggested topic", async (assert) => {
+ test("go to first suggested topic", async function (assert) {
await visit("/t/this-is-a-test-topic/9");
- await keyEvent(document, "keypress", "g".charCodeAt(0));
- await keyEvent(document, "keypress", "s".charCodeAt(0));
+ await triggerKeyEvent(document, "keypress", "g".charCodeAt(0));
+ await triggerKeyEvent(document, "keypress", "s".charCodeAt(0));
assert.equal(currentURL(), "/t/this-is-a-test-topic/9");
// Suggested topics elements exist.
await visit("/t/internationalization-localization/280");
- await keyEvent(document, "keypress", "g".charCodeAt(0));
- await keyEvent(document, "keypress", "s".charCodeAt(0));
+ await triggerKeyEvent(document, "keypress", "g".charCodeAt(0));
+ await triggerKeyEvent(document, "keypress", "s".charCodeAt(0));
assert.equal(currentURL(), "/t/polls-are-still-very-buggy/27331/4");
await visit("/t/1-3-0beta9-no-rate-limit-popups/28830");
- await keyEvent(document, "keypress", "g".charCodeAt(0));
- await keyEvent(document, "keypress", "s".charCodeAt(0));
+ await triggerKeyEvent(document, "keypress", "g".charCodeAt(0));
+ await triggerKeyEvent(document, "keypress", "s".charCodeAt(0));
assert.equal(currentURL(), "/t/keyboard-shortcuts-are-awesome/27331");
});
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-redirect-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-redirect-test.js
index 0c3ad6a992..6d3b26ff95 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-redirect-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-redirect-test.js
@@ -1,4 +1,4 @@
-import { visit } from "@ember/test-helpers";
+import { visit, currentRouteName } from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
@@ -6,7 +6,7 @@ acceptance("Login redirect - anonymous", function () {
test("redirects login to default homepage", async function (assert) {
await visit("/login");
assert.equal(
- currentPath(),
+ currentRouteName(),
"discovery.latest",
"it works when latest is the homepage"
);
@@ -21,7 +21,7 @@ acceptance("Login redirect - categories default", function (needs) {
test("when site setting is categories", async function (assert) {
await visit("/login");
assert.equal(
- currentPath(),
+ currentRouteName(),
"discovery.categories",
"it works when categories is the homepage"
);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js
index aaf60309bf..5f80484c50 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-required-test.js
@@ -1,18 +1,18 @@
import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { click, visit } from "@ember/test-helpers";
+import { click, visit, currentRouteName } from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance, invisible } from "discourse/tests/helpers/qunit-helpers";
acceptance("Login Required", function (needs) {
needs.settings({ login_required: true });
- test("redirect", async (assert) => {
+ test("redirect", async function (assert) {
await visit("/latest");
- assert.equal(currentPath(), "login", "it redirects them to login");
+ assert.equal(currentRouteName(), "login", "it redirects them to login");
await click("#site-logo");
assert.equal(
- currentPath(),
+ currentRouteName(),
"login",
"clicking the logo keeps them on login"
);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-hide-email-address-taken-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-hide-email-address-taken-test.js
index 320911e7c6..701e28cf1a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-hide-email-address-taken-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-hide-email-address-taken-test.js
@@ -16,7 +16,7 @@ acceptance("Login with email - hide email address taken", function (needs) {
});
});
- test("with hide_email_address_taken enabled", async (assert) => {
+ test("with hide_email_address_taken enabled", async function (assert) {
await visit("/");
await click("header .login-button");
await fillIn("#login-account-name", "someuser@example.com");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-no-social-logins-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-no-social-logins-test.js
index 7567cd2ec4..4d5204798b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-no-social-logins-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-and-no-social-logins-test.js
@@ -9,14 +9,14 @@ acceptance("Login with email - no social logins", function (needs) {
needs.pretender((server, helper) => {
server.post("/u/email-login", () => helper.response({ success: "OK" }));
});
- test("with login with email enabled", async (assert) => {
+ test("with login with email enabled", async function (assert) {
await visit("/");
await click("header .login-button");
assert.ok(exists(".login-with-email-button"));
});
- test("with login with email disabled", async (assert) => {
+ test("with login with email disabled", async function (assert) {
await visit("/");
await click("header .login-button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-disabled-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-disabled-test.js
index b506d75a41..f31517f370 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-disabled-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-disabled-test.js
@@ -9,7 +9,7 @@ acceptance("Login with email disabled", function (needs) {
enable_facebook_logins: true,
});
- test("with email button", async (assert) => {
+ test("with email button", async function (assert) {
await visit("/");
await click("header .login-button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js
index b59938e5fc..2e6df8184e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/login-with-email-test.js
@@ -18,7 +18,7 @@ acceptance("Login with email", function (needs) {
);
});
- test("with email button", async (assert) => {
+ test("with email button", async function (assert) {
await visit("/");
await click("header .login-button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-discovery-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-discovery-test.js
index 377f9a5d89..550d2e4c3e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-discovery-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-discovery-test.js
@@ -5,7 +5,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Topic Discovery - Mobile", function (needs) {
needs.mobileView();
- test("Visit Discovery Pages", async (assert) => {
+ test("Visit Discovery Pages", async function (assert) {
await visit("/");
assert.ok(exists(".topic-list"), "The list of topics was rendered");
assert.ok(exists(".topic-list .topic-list-item"), "has topics");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-sign-in-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-sign-in-test.js
index 21f2b5a802..bb21a4023c 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-sign-in-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-sign-in-test.js
@@ -5,7 +5,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Signing In - Mobile", function (needs) {
needs.mobileView();
- test("sign in", async (assert) => {
+ test("sign in", async function (assert) {
await visit("/");
await click("header .login-button");
assert.ok(exists("#login-form"), "it shows the login modal");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js b/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js
index ac61ffa2c8..1aec2d9466 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/mobile-users-test.js
@@ -5,7 +5,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("User Directory - Mobile", function (needs) {
needs.mobileView();
- test("Visit Page", async (assert) => {
+ test("Visit Page", async function (assert) {
await visit("/u");
assert.ok(exists(".directory .user"), "has a list of users");
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
index 0f802b01c3..2ddea16a25 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js
@@ -1,6 +1,6 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { click, visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { click, triggerKeyEvent, visit } from "@ember/test-helpers";
+import { skip, test } from "qunit";
import I18n from "I18n";
import { run } from "@ember/runloop";
import {
@@ -27,7 +27,7 @@ acceptance("Modal", function (needs) {
I18n.translations = _translations;
});
- test("modal", async function (assert) {
+ skip("modal", async function (assert) {
await visit("/");
assert.ok(
@@ -54,7 +54,7 @@ acceptance("Modal", function (needs) {
"modal should reappear"
);
- await keyEvent("#main-outlet", "keyup", 27);
+ await triggerKeyEvent("#main-outlet", "keyup", 27);
assert.ok(
queryAll(".d-modal:visible").length === 0,
"ESC should close the modal"
@@ -73,7 +73,7 @@ acceptance("Modal", function (needs) {
queryAll(".d-modal:visible").length === 1,
"modal should not disappear when you click outside"
);
- await keyEvent("#main-outlet", "keyup", 27);
+ await triggerKeyEvent("#main-outlet", "keyup", 27);
assert.ok(
queryAll(".d-modal:visible").length === 1,
"ESC should not close the modal"
@@ -139,7 +139,7 @@ acceptance("Modal Keyboard Events", function (needs) {
await click(".toggle-admin-menu");
await click(".topic-admin-status-update button");
- await keyEvent(".d-modal", "keyup", 13);
+ await triggerKeyEvent(".d-modal", "keyup", 13);
assert.ok(
queryAll("#modal-alert:visible").length === 1,
@@ -150,7 +150,7 @@ acceptance("Modal Keyboard Events", function (needs) {
"hitting Enter does not dismiss modal due to alert error"
);
- await keyEvent("#main-outlet", "keyup", 27);
+ await triggerKeyEvent("#main-outlet", "keyup", 27);
assert.ok(
queryAll(".d-modal:visible").length === 0,
"ESC should close the modal"
@@ -160,7 +160,7 @@ acceptance("Modal Keyboard Events", function (needs) {
await click(".d-editor-button-bar .btn.link");
- await keyEvent(".d-modal", "keyup", 13);
+ await triggerKeyEvent(".d-modal", "keyup", 13);
assert.ok(
queryAll(".d-modal:visible").length === 0,
"modal should disappear on hitting Enter"
diff --git a/app/assets/javascripts/discourse/tests/acceptance/new-message-test.js b/app/assets/javascripts/discourse/tests/acceptance/new-message-test.js
index 9fc2484c9d..7cbbaf4e44 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/new-message-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/new-message-test.js
@@ -5,7 +5,7 @@ import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("New Message - Anonymous", function () {
- test("accessing new-message route when logged out", async (assert) => {
+ test("accessing new-message route when logged out", async function (assert) {
await visit(
"/new-message?username=charlie&title=message%20title&body=message%20body"
);
@@ -17,7 +17,7 @@ acceptance("New Message - Anonymous", function () {
acceptance("New Message - Authenticated", function (needs) {
needs.user();
- test("accessing new-message route when logged in", async (assert) => {
+ test("accessing new-message route when logged in", async function (assert) {
await visit(
"/new-message?username=charlie&title=message%20title&body=message%20body"
);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js
index cd211b6167..2ae375b295 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/new-topic-test.js
@@ -6,7 +6,7 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("New Topic - Anonymous", function () {
- test("accessing new-topic route when logged out", async (assert) => {
+ test("accessing new-topic route when logged out", async function (assert) {
await visit("/new-topic?title=topic%20title&body=topic%20body");
assert.ok(exists(".modal.login-modal"), "it shows the login modal");
@@ -15,7 +15,7 @@ acceptance("New Topic - Anonymous", function () {
acceptance("New Topic - Authenticated", function (needs) {
needs.user();
- test("accessing new-topic route when logged in", async (assert) => {
+ test("accessing new-topic route when logged in", async function (assert) {
await visit(
"/new-topic?title=topic%20title&body=topic%20body&category=bug"
);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/notifications-filter-test.js b/app/assets/javascripts/discourse/tests/acceptance/notifications-filter-test.js
index a4ec9a19e9..187e4a8016 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/notifications-filter-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/notifications-filter-test.js
@@ -7,13 +7,13 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
acceptance("Notifications filter", function (needs) {
needs.user();
- test("Notifications filter true", async (assert) => {
+ test("Notifications filter true", async function (assert) {
await visit("/u/eviltrout/notifications");
assert.ok(queryAll(".large-notification").length >= 0);
});
- test("Notifications filter read", async (assert) => {
+ test("Notifications filter read", async function (assert) {
await visit("/u/eviltrout/notifications");
const dropdown = selectKit(".notifications-filter");
@@ -23,7 +23,7 @@ acceptance("Notifications filter", function (needs) {
assert.ok(queryAll(".large-notification").length >= 0);
});
- test("Notifications filter unread", async (assert) => {
+ test("Notifications filter unread", async function (assert) {
await visit("/u/eviltrout/notifications");
const dropdown = selectKit(".notifications-filter");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/page-publishing-test.js b/app/assets/javascripts/discourse/tests/acceptance/page-publishing-test.js
index a819687581..3f97193dbc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/page-publishing-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/page-publishing-test.js
@@ -25,7 +25,7 @@ acceptance("Page Publishing", function (needs) {
});
});
- test("can publish a page via modal", async (assert) => {
+ test("can publish a page via modal", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".topic-post:eq(0) button.show-more-actions");
await click(".topic-post:eq(0) button.show-post-admin-menu");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js b/app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js
index ec79b84b74..58dd51bb13 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/password-reset-test.js
@@ -59,7 +59,7 @@ acceptance("Password Reset", function (needs) {
});
});
- test("Password Reset Page", async (assert) => {
+ test("Password Reset Page", async function (assert) {
PreloadStore.store("password_reset", { is_developer: false });
await visit("/u/password-reset/myvalidtoken");
@@ -93,7 +93,7 @@ acceptance("Password Reset", function (needs) {
assert.ok(DiscourseURL.redirectTo.calledWith("/"), "form is gone");
});
- test("Password Reset Page With Second Factor", async (assert) => {
+ test("Password Reset Page With Second Factor", async function (assert) {
PreloadStore.store("password_reset", {
is_developer: false,
second_factor_required: true,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js
index d27b79d315..ad9c88d03a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js
@@ -8,7 +8,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Personal Message", function (needs) {
needs.user();
- test("footer edit button", async (assert) => {
+ test("footer edit button", async function (assert) {
await visit("/t/pm-for-testing/12");
assert.ok(
@@ -17,7 +17,7 @@ acceptance("Personal Message", function (needs) {
);
});
- test("suggested messages", async (assert) => {
+ test("suggested messages", async function (assert) {
await visit("/t/pm-for-testing/12");
assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js
index 2641eaeee2..ba4bc64e52 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js
@@ -1,4 +1,4 @@
-import { visit } from "@ember/test-helpers";
+import { triggerKeyEvent, visit } from "@ember/test-helpers";
import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
import { withPluginApi } from "discourse/lib/plugin-api";
@@ -11,7 +11,7 @@ acceptance("Plugin Keyboard Shortcuts - Logged In", function (needs) {
needs.hooks.beforeEach(function () {
KeyboardShortcutInitializer.initialize(this.container);
});
- test("a plugin can add a keyboard shortcut", async (assert) => {
+ test("a plugin can add a keyboard shortcut", async function (assert) {
withPluginApi("0.8.38", (api) => {
api.addKeyboardShortcut("]", () => {
$("#qunit-fixture").html(
@@ -21,7 +21,7 @@ acceptance("Plugin Keyboard Shortcuts - Logged In", function (needs) {
});
await visit("/t/this-is-a-test-topic/9");
- await keyEvent(document, "keypress", "]".charCodeAt(0));
+ await triggerKeyEvent(document, "keypress", "]".charCodeAt(0));
assert.equal(
$("#added-element").length,
1,
@@ -34,7 +34,7 @@ acceptance("Plugin Keyboard Shortcuts - Anonymous", function (needs) {
needs.hooks.beforeEach(function () {
KeyboardShortcutInitializer.initialize(this.container);
});
- test("a plugin can add a keyboard shortcut with an option", async (assert) => {
+ test("a plugin can add a keyboard shortcut with an option", async function (assert) {
let spy = sinon.spy(KeyboardShortcuts, "_bindToPath");
withPluginApi("0.8.38", (api) => {
api.addKeyboardShortcut("]", () => {}, {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
index b7897f3d56..5d72aada13 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js
@@ -67,7 +67,7 @@ acceptance("Plugin Outlet - Connector Class", function (needs) {
delete Ember.TEMPLATES[`${PREFIX}/user-profile-primary/dont-render`];
});
- test("Renders a template into the outlet", async (assert) => {
+ test("Renders a template into the outlet", async function (assert) {
await visit("/u/eviltrout");
assert.ok(
queryAll(".user-profile-primary-outlet.hello").length === 1,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js
index 721f555eca..2a7c843c3b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js
@@ -42,7 +42,7 @@ acceptance("Plugin Outlet - Decorator", function (needs) {
delete Ember.TEMPLATES[`${PREFIX}/discovery-list-container-top/bar`];
});
- test("Calls the plugin callback with the rendered outlet", async (assert) => {
+ test("Calls the plugin callback with the rendered outlet", async function (assert) {
await visit("/");
const fooConnector = queryAll(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js
index be36be14fe..80ead275a1 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js
@@ -25,7 +25,7 @@ acceptance("Plugin Outlet - Multi Template", function (needs) {
clearCache();
});
- test("Renders a template into the outlet", async (assert) => {
+ test("Renders a template into the outlet", async function (assert) {
await visit("/u/eviltrout");
assert.ok(
queryAll(".user-profile-primary-outlet.hello").length === 1,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
index 75eedd4403..3915cad663 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js
@@ -17,7 +17,7 @@ acceptance("Plugin Outlet - Single Template", function (needs) {
delete Ember.TEMPLATES[CONNECTOR];
});
- test("Renders a template into the outlet", async (assert) => {
+ test("Renders a template into the outlet", async function (assert) {
await visit("/u/eviltrout");
assert.ok(
queryAll(".user-profile-primary-outlet.hello").length === 1,
diff --git a/app/assets/javascripts/discourse/tests/acceptance/post-admin-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/post-admin-menu-test.js
index 5cda91ea8c..a8d08aeab2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/post-admin-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/post-admin-menu-test.js
@@ -4,7 +4,7 @@ import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Post - Admin Menu - Anonymous", function () {
- test("Enter as a anon user", async (assert) => {
+ test("Enter as a anon user", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".show-more-actions");
@@ -22,7 +22,7 @@ acceptance("Post - Admin Menu - Anonymous", function () {
acceptance("Post - Admin Menu - Authenticated", function (needs) {
needs.user();
- test("Enter as a user with group moderator permissions", async (assert) => {
+ test("Enter as a user with group moderator permissions", async function (assert) {
await visit("/t/topic-for-group-moderators/2480");
await click(".show-more-actions");
await click(".show-post-admin-menu");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
index 55b8fa9f24..22acfec0b8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/preferences-test.js
@@ -1,6 +1,12 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { visit, currentURL, click, fillIn } from "@ember/test-helpers";
+import {
+ visit,
+ currentURL,
+ currentRouteName,
+ click,
+ fillIn,
+} from "@ember/test-helpers";
import { test } from "qunit";
import I18n from "I18n";
import {
@@ -71,7 +77,7 @@ function preferencesPretender(server, helper) {
acceptance("User Preferences", function (needs) {
needs.user();
needs.pretender(preferencesPretender);
- test("update some fields", async (assert) => {
+ test("update some fields", async function (assert) {
await visit("/u/eviltrout/preferences");
assert.ok($("body.user-preferences-page").length, "has the body class");
@@ -128,12 +134,12 @@ acceptance("User Preferences", function (needs) {
);
});
- test("username", async (assert) => {
+ test("username", async function (assert) {
await visit("/u/eviltrout/preferences/username");
assert.ok(exists("#change_username"), "it has the input element");
});
- test("email", async (assert) => {
+ test("email", async function (assert) {
await visit("/u/eviltrout/preferences/email");
assert.ok(exists("#change-email"), "it has the input element");
@@ -147,7 +153,7 @@ acceptance("User Preferences", function (needs) {
);
});
- test("email field always shows up", async (assert) => {
+ test("email field always shows up", async function (assert) {
await visit("/u/eviltrout/preferences/email");
assert.ok(exists("#change-email"), "it has the input element");
@@ -161,7 +167,7 @@ acceptance("User Preferences", function (needs) {
assert.ok(exists("#change-email"), "it has the input element");
});
- test("connected accounts", async (assert) => {
+ test("connected accounts", async function (assert) {
await visit("/u/eviltrout/preferences/account");
assert.ok(
@@ -182,7 +188,7 @@ acceptance("User Preferences", function (needs) {
.indexOf("Connect") > -1;
});
- test("second factor totp", async (assert) => {
+ test("second factor totp", async function (assert) {
await visit("/u/eviltrout/preferences/second-factor");
assert.ok(exists("#password"), "it has a password input");
@@ -203,7 +209,7 @@ acceptance("User Preferences", function (needs) {
);
});
- test("second factor security keys", async (assert) => {
+ test("second factor security keys", async function (assert) {
await visit("/u/eviltrout/preferences/second-factor");
assert.ok(exists("#password"), "it has a password input");
@@ -229,7 +235,7 @@ acceptance("User Preferences", function (needs) {
}
});
- test("default avatar selector", async (assert) => {
+ test("default avatar selector", async function (assert) {
await visit("/u/eviltrout/preferences");
await click(".pref-avatar .btn");
@@ -266,7 +272,7 @@ acceptance("Second Factor Backups", function (needs) {
});
});
- test("second factor backup", async (assert) => {
+ test("second factor backup", async function (assert) {
updateCurrentUser({ second_factor_enabled: true });
await visit("/u/eviltrout/preferences/second-factor");
await click(".edit-2fa-backup");
@@ -294,7 +300,7 @@ acceptance("Avatar selector when selectable avatars is enabled", function (
);
});
- test("selectable avatars", async (assert) => {
+ test("selectable avatars", async function (assert) {
await visit("/u/eviltrout/preferences");
await click(".pref-avatar .btn");
assert.ok(
@@ -308,7 +314,7 @@ acceptance("User Preferences when badges are disabled", function (needs) {
needs.settings({ enable_badges: false });
needs.pretender(preferencesPretender);
- test("visit my preferences", async (assert) => {
+ test("visit my preferences", async function (assert) {
await visit("/u/eviltrout/preferences");
assert.ok($("body.user-preferences-page").length, "has the body class");
assert.equal(
@@ -319,7 +325,7 @@ acceptance("User Preferences when badges are disabled", function (needs) {
assert.ok(exists(".user-preferences"), "it shows the preferences");
});
- test("recently connected devices", async (assert) => {
+ test("recently connected devices", async function (assert) {
await visit("/u/eviltrout/preferences");
assert.equal(
@@ -374,7 +380,7 @@ acceptance(
});
});
- test("setting featured topic on profile", async (assert) => {
+ test("setting featured topic on profile", async function (assert) {
await visit("/u/eviltrout/preferences/profile");
assert.ok(
@@ -429,7 +435,7 @@ acceptance("Custom User Fields", function (needs) {
});
needs.pretender(preferencesPretender);
- test("can select an option from a dropdown", async (assert) => {
+ test("can select an option from a dropdown", async function (assert) {
await visit("/u/eviltrout/preferences/profile");
assert.ok(exists(".user-field"), "it has at least one user field");
await click(".user-field.dropdown");
@@ -455,7 +461,7 @@ acceptance(
top_menu: "categories|latest|top|bookmarks",
});
- test("selecting bookmarks as home directs home to bookmarks", async (assert) => {
+ test("selecting bookmarks as home directs home to bookmarks", async function (assert) {
await visit("/u/eviltrout/preferences/interface");
assert.ok(exists(".home .combo-box"), "it has a home selector combo-box");
@@ -466,7 +472,7 @@ acceptance(
await visit("/");
assert.ok(exists(".topic-list"), "The list of topics was rendered");
assert.equal(
- currentPath(),
+ currentRouteName(),
"discovery.bookmarks",
"it navigates to bookmarks"
);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js b/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js
index 0787e20e22..b700fa0433 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/raw-plugin-outlet-test.js
@@ -22,7 +22,7 @@ acceptance("Raw Plugin Outlet", function (needs) {
needs.hooks.afterEach(() => {
removeRawTemplate(CONNECTOR);
});
- test("Renders the raw plugin outlet", async (assert) => {
+ test("Renders the raw plugin outlet", async function (assert) {
await visit("/");
assert.ok(queryAll(".topic-lala").length > 0, "it renders the outlet");
assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/redirect-to-top-test.js b/app/assets/javascripts/discourse/tests/acceptance/redirect-to-top-test.js
index eed2fdbc17..f698cfe2f4 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/redirect-to-top-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/redirect-to-top-test.js
@@ -1,4 +1,4 @@
-import { visit } from "@ember/test-helpers";
+import { visit, currentRouteName } from "@ember/test-helpers";
import { test } from "qunit";
import {
acceptance,
@@ -20,7 +20,7 @@ acceptance("Redirect to Top", function (needs) {
});
needs.user();
- test("redirects categories to weekly top", async (assert) => {
+ test("redirects categories to weekly top", async function (assert) {
updateCurrentUser({
should_be_redirected_to_top: true,
redirected_to_top: {
@@ -31,13 +31,13 @@ acceptance("Redirect to Top", function (needs) {
await visit("/categories");
assert.equal(
- currentPath(),
+ currentRouteName(),
"discovery.topWeekly",
"it works for categories"
);
});
- test("redirects latest to monthly top", async (assert) => {
+ test("redirects latest to monthly top", async function (assert) {
updateCurrentUser({
should_be_redirected_to_top: true,
redirected_to_top: {
@@ -47,10 +47,14 @@ acceptance("Redirect to Top", function (needs) {
});
await visit("/latest");
- assert.equal(currentPath(), "discovery.topMonthly", "it works for latest");
+ assert.equal(
+ currentRouteName(),
+ "discovery.topMonthly",
+ "it works for latest"
+ );
});
- test("redirects root to All top", async (assert) => {
+ test("redirects root to All top", async function (assert) {
updateCurrentUser({
should_be_redirected_to_top: true,
redirected_to_top: {
@@ -60,6 +64,6 @@ acceptance("Redirect to Top", function (needs) {
});
await visit("/");
- assert.equal(currentPath(), "discovery.topAll", "it works for root");
+ assert.equal(currentRouteName(), "discovery.topAll", "it works for root");
});
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/reports-test.js b/app/assets/javascripts/discourse/tests/acceptance/reports-test.js
index 7cd8438629..4978ba53a8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/reports-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/reports-test.js
@@ -6,7 +6,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Reports", function (needs) {
needs.user();
- test("Visit reports page", async (assert) => {
+ test("Visit reports page", async function (assert) {
await visit("/admin/reports");
assert.equal($(".reports-list .report").length, 1);
@@ -21,7 +21,7 @@ acceptance("Reports", function (needs) {
);
});
- test("Visit report page", async (assert) => {
+ test("Visit report page", async function (assert) {
await visit("/admin/reports/staff_logins");
assert.ok(exists(".export-csv-btn"));
diff --git a/app/assets/javascripts/discourse/tests/acceptance/review-test.js b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
index b668751afe..84acbbedb2 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/review-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
@@ -9,7 +9,7 @@ acceptance("Review", function (needs) {
const user = ".reviewable-item[data-reviewable-id=1234]";
- test("It returns a list of reviewable items", async (assert) => {
+ test("It returns a list of reviewable items", async function (assert) {
await visit("/review");
assert.ok(queryAll(".reviewable-item").length, "has a list of items");
@@ -28,7 +28,7 @@ acceptance("Review", function (needs) {
);
});
- test("Grouped by topic", async (assert) => {
+ test("Grouped by topic", async function (assert) {
await visit("/review/topics");
assert.ok(
queryAll(".reviewable-topic").length,
@@ -36,7 +36,7 @@ acceptance("Review", function (needs) {
);
});
- test("Settings", async (assert) => {
+ test("Settings", async function (assert) {
await visit("/review/settings");
assert.ok(
@@ -52,7 +52,7 @@ acceptance("Review", function (needs) {
assert.ok(queryAll(".reviewable-settings .saved").length, "it saved");
});
- test("Flag related", async (assert) => {
+ test("Flag related", async function (assert) {
await visit("/review");
assert.ok(
@@ -72,7 +72,7 @@ acceptance("Review", function (needs) {
);
});
- test("Flag related", async (assert) => {
+ test("Flag related", async function (assert) {
await visit("/review/1");
assert.ok(
@@ -81,7 +81,7 @@ acceptance("Review", function (needs) {
);
});
- test("Clicking the buttons triggers actions", async (assert) => {
+ test("Clicking the buttons triggers actions", async function (assert) {
await visit("/review");
await click(`${user} .reviewable-action.approve`);
assert.equal(
@@ -91,7 +91,7 @@ acceptance("Review", function (needs) {
);
});
- test("Editing a reviewable", async (assert) => {
+ test("Editing a reviewable", async function (assert) {
const topic = ".reviewable-item[data-reviewable-id=4321]";
await visit("/review");
assert.ok(queryAll(`${topic} .reviewable-action.approve`).length);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
index 3700265d7a..d0af70768e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
@@ -1,6 +1,6 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { visit, fillIn, click } from "@ember/test-helpers";
+import { triggerKeyEvent, visit, fillIn, click } from "@ember/test-helpers";
import { skip, test } from "qunit";
import selectKit from "discourse/tests/helpers/select-kit-helper";
import {
@@ -91,7 +91,7 @@ acceptance("Search - Full Page", function (needs) {
});
});
- test("perform various searches", async (assert) => {
+ test("perform various searches", async function (assert) {
await visit("/search");
assert.ok($("body.search-page").length, "has body class");
@@ -111,7 +111,7 @@ acceptance("Search - Full Page", function (needs) {
assert.ok(queryAll(".fps-topic").length === 1, "has one post");
});
- test("escape search term", async (assert) => {
+ test("escape search term", async function (assert) {
await visit("/search");
await fillIn(".search-query", "@gmail.com");
@@ -123,12 +123,16 @@ acceptance("Search - Full Page", function (needs) {
);
});
- skip("update username through advanced search ui", async (assert) => {
+ skip("update username through advanced search ui", async function (assert) {
await visit("/search");
await fillIn(".search-query", "none");
await fillIn(".search-advanced-options .user-selector", "admin");
await click(".search-advanced-options .user-selector");
- await keyEvent(".search-advanced-options .user-selector", "keydown", 8);
+ await triggerKeyEvent(
+ ".search-advanced-options .user-selector",
+ "keydown",
+ 8
+ );
waitFor(assert, async () => {
assert.ok(
@@ -156,7 +160,7 @@ acceptance("Search - Full Page", function (needs) {
});
});
- test("update category through advanced search ui", async (assert) => {
+ test("update category through advanced search ui", async function (assert) {
const categoryChooser = selectKit(
".search-advanced-options .category-chooser"
);
@@ -180,7 +184,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("update in:title filter through advanced search ui", async (assert) => {
+ test("update in:title filter through advanced search ui", async function (assert) {
await visit("/search");
await fillIn(".search-query", "none");
await click(".search-advanced-options .in-title");
@@ -203,7 +207,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("update in:likes filter through advanced search ui", async (assert) => {
+ test("update in:likes filter through advanced search ui", async function (assert) {
await visit("/search");
await fillIn(".search-query", "none");
await click(".search-advanced-options .in-likes");
@@ -219,7 +223,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("update in:personal filter through advanced search ui", async (assert) => {
+ test("update in:personal filter through advanced search ui", async function (assert) {
await visit("/search");
await fillIn(".search-query", "none");
await click(".search-advanced-options .in-private");
@@ -243,7 +247,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("update in:seen filter through advanced search ui", async (assert) => {
+ test("update in:seen filter through advanced search ui", async function (assert) {
await visit("/search");
await fillIn(".search-query", "none");
await click(".search-advanced-options .in-seen");
@@ -267,7 +271,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("update in filter through advanced search ui", async (assert) => {
+ test("update in filter through advanced search ui", async function (assert) {
const inSelector = selectKit(".search-advanced-options .select-kit#in");
await visit("/search");
@@ -288,7 +292,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("update status through advanced search ui", async (assert) => {
+ test("update status through advanced search ui", async function (assert) {
const statusSelector = selectKit(
".search-advanced-options .select-kit#status"
);
@@ -311,7 +315,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("doesn't update status filter header if wrong value entered through searchbox", async (assert) => {
+ test("doesn't update status filter header if wrong value entered through searchbox", async function (assert) {
const statusSelector = selectKit(
".search-advanced-options .select-kit#status"
);
@@ -323,7 +327,7 @@ acceptance("Search - Full Page", function (needs) {
assert.equal(statusSelector.header().label(), "any", 'has "any" populated');
});
- test("doesn't update in filter header if wrong value entered through searchbox", async (assert) => {
+ test("doesn't update in filter header if wrong value entered through searchbox", async function (assert) {
const inSelector = selectKit(".search-advanced-options .select-kit#in");
await visit("/search");
@@ -333,7 +337,7 @@ acceptance("Search - Full Page", function (needs) {
assert.equal(inSelector.header().label(), "any", 'has "any" populated');
});
- test("update post time through advanced search ui", async (assert) => {
+ test("update post time through advanced search ui", async function (assert) {
await visit("/search?expanded=true&q=after:2018-08-22");
assert.equal(
@@ -366,7 +370,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("update min post count through advanced search ui", async (assert) => {
+ test("update min post count through advanced search ui", async function (assert) {
await visit("/search");
await fillIn(".search-query", "none");
await fillIn("#search-min-post-count", "5");
@@ -383,7 +387,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("update max post count through advanced search ui", async (assert) => {
+ test("update max post count through advanced search ui", async function (assert) {
await visit("/search");
await fillIn(".search-query", "none");
await fillIn("#search-max-post-count", "5");
@@ -400,7 +404,7 @@ acceptance("Search - Full Page", function (needs) {
);
});
- test("validate advanced search when initially empty", async (assert) => {
+ test("validate advanced search when initially empty", async function (assert) {
await visit("/search?expanded=true");
await click(".search-advanced-options .in-likes");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-mobile-test.js
index 0e6d297fe2..95c2664081 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-mobile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-mobile-test.js
@@ -7,7 +7,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Search - Mobile", function (needs) {
needs.mobileView();
- test("search", async (assert) => {
+ test("search", async function (assert) {
await visit("/");
await click("#search-button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index d081613bb4..d9f72c0a2e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -1,6 +1,6 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { click, fillIn, visit } from "@ember/test-helpers";
+import { click, triggerKeyEvent, fillIn, visit } from "@ember/test-helpers";
import { test } from "qunit";
import selectKit from "discourse/tests/helpers/select-kit-helper";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
@@ -19,7 +19,7 @@ acceptance("Search - Anonymous", function (needs) {
});
});
- test("search", async (assert) => {
+ test("search", async function (assert) {
await visit("/");
await click("#search-button");
@@ -28,7 +28,7 @@ acceptance("Search - Anonymous", function (needs) {
assert.ok(!exists(".search-menu .results ul li"), "no results by default");
await fillIn("#search-term", "dev");
- await keyEvent("#search-term", "keyup", 16);
+ await triggerKeyEvent("#search-term", "keyup", 16);
assert.ok(exists(".search-menu .results ul li"), "it shows results");
assert.ok(
exists(".search-menu .results ul li .topic-title[data-topic-id]"),
@@ -48,17 +48,17 @@ acceptance("Search - Anonymous", function (needs) {
);
});
- test("search for a tag", async (assert) => {
+ test("search for a tag", async function (assert) {
await visit("/");
await click("#search-button");
await fillIn("#search-term", "evil");
- await keyEvent("#search-term", "keyup", 16);
+ await triggerKeyEvent("#search-term", "keyup", 16);
assert.ok(exists(".search-menu .results ul li"), "it shows results");
});
- test("search scope checkbox", async (assert) => {
+ test("search scope checkbox", async function (assert) {
await visit("/tag/important");
await click("#search-button");
assert.ok(
@@ -91,13 +91,13 @@ acceptance("Search - Anonymous", function (needs) {
);
});
- test("Search with context", async (assert) => {
+ test("Search with context", async function (assert) {
await visit("/t/internationalization-localization/280/1");
await click("#search-button");
await fillIn("#search-term", "a proper");
await click(".search-context input[type='checkbox']");
- await keyEvent("#search-term", "keyup", 16);
+ await triggerKeyEvent("#search-term", "keyup", 16);
assert.ok(exists(".search-menu .results ul li"), "it shows results");
@@ -126,7 +126,7 @@ acceptance("Search - Anonymous", function (needs) {
assert.ok(!$(".search-context input[type=checkbox]").is(":checked"));
});
- test("Right filters are shown to anonymous users", async (assert) => {
+ test("Right filters are shown to anonymous users", async function (assert) {
const inSelector = selectKit(".select-kit#in");
await visit("/search?expanded=true");
@@ -153,7 +153,7 @@ acceptance("Search - Anonymous", function (needs) {
acceptance("Search - Authenticated", function (needs) {
needs.user();
- test("Right filters are shown to logged-in users", async (assert) => {
+ test("Right filters are shown to logged-in users", async function (assert) {
const inSelector = selectKit(".select-kit#in");
await visit("/search?expanded=true");
@@ -181,13 +181,13 @@ acceptance("Search - with tagging enabled", function (needs) {
needs.user();
needs.settings({ tagging_enabled: true });
- test("displays tags", async (assert) => {
+ test("displays tags", async function (assert) {
await visit("/");
await click("#search-button");
await fillIn("#search-term", "dev");
- await keyEvent("#search-term", "keyup", 16);
+ await triggerKeyEvent("#search-term", "keyup", 16);
const tags = queryAll(".search-menu .results ul li:eq(0) .discourse-tags")
.text()
diff --git a/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-desktop-test.js b/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-desktop-test.js
index de2bda0fe2..ead72fad11 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-desktop-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-desktop-test.js
@@ -7,7 +7,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Share and Invite modal - desktop", function (needs) {
needs.user();
- test("Topic footer button", async (assert) => {
+ test("Topic footer button", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.ok(
@@ -69,7 +69,7 @@ acceptance("Share and Invite modal - desktop", function (needs) {
);
});
- test("Post date link", async (assert) => {
+ test("Post date link", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#post_2 .post-info.post-date a");
@@ -80,7 +80,7 @@ acceptance("Share and Invite modal - desktop", function (needs) {
acceptance("Share url with badges disabled - desktop", function (needs) {
needs.user();
needs.settings({ enable_badges: false });
- test("topic footer button - badges disabled - desktop", async (assert) => {
+ test("topic footer button - badges disabled - desktop", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-footer-button-share-and-invite");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-mobile-test.js
index 1846134abe..07696332d0 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-mobile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/share-and-invite-mobile-test.js
@@ -9,7 +9,7 @@ acceptance("Share and Invite modal - mobile", function (needs) {
needs.user();
needs.mobileView();
- test("Topic footer mobile button", async (assert) => {
+ test("Topic footer mobile button", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.ok(
@@ -57,7 +57,7 @@ acceptance("Share and Invite modal - mobile", function (needs) {
);
});
- test("Post date link", async (assert) => {
+ test("Post date link", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#post_2 .post-info.post-date a");
@@ -71,7 +71,7 @@ acceptance("Share url with badges disabled - mobile", function (needs) {
needs.settings({
enable_badges: false,
});
- test("topic footer button - badges disabled - mobile", async (assert) => {
+ test("topic footer button - badges disabled - mobile", async function (assert) {
await visit("/t/internationalization-localization/280");
const subject = selectKit(".topic-footer-mobile-dropdown");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js b/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js
index 982eae4012..df5d370a0b 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/shared-drafts-test.js
@@ -5,7 +5,7 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Shared Drafts", function () {
- test("Viewing", async (assert) => {
+ test("Viewing", async function (assert) {
await visit("/t/some-topic/9");
assert.ok(queryAll(".shared-draft-controls").length === 1);
let categoryChooser = selectKit(".shared-draft-controls .category-chooser");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js b/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js
index 3d074a4994..5d84d94b3f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/sign-in-test.js
@@ -1,11 +1,11 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { exists } from "discourse/tests/helpers/qunit-helpers";
import { click, fillIn, visit } from "@ember/test-helpers";
-import { test } from "qunit";
+import { skip, test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Signing In", function () {
- test("sign in", async (assert) => {
+ test("sign in", async function (assert) {
await visit("/");
await click("header .login-button");
assert.ok(exists(".login-modal"), "it shows the login modal");
@@ -29,7 +29,7 @@ acceptance("Signing In", function () {
);
});
- test("sign in - not activated", async (assert) => {
+ test("sign in - not activated", async function (assert) {
await visit("/");
await click("header .login-button");
assert.ok(exists(".login-modal"), "it shows the login modal");
@@ -51,7 +51,7 @@ acceptance("Signing In", function () {
assert.ok(!exists(".modal-body small"), "it escapes the email address");
});
- test("sign in - not activated - edit email", async (assert) => {
+ test("sign in - not activated - edit email", async function (assert) {
await visit("/");
await click("header .login-button");
assert.ok(exists(".login-modal"), "it shows the login modal");
@@ -72,7 +72,7 @@ acceptance("Signing In", function () {
assert.equal(queryAll(".modal-body b").text(), "different@example.com");
});
- test("second factor", async (assert) => {
+ skip("second factor", async function (assert) {
await visit("/");
await click("header .login-button");
@@ -105,7 +105,7 @@ acceptance("Signing In", function () {
);
});
- test("security key", async (assert) => {
+ skip("security key", async function (assert) {
await visit("/");
await click("header .login-button");
@@ -131,7 +131,7 @@ acceptance("Signing In", function () {
assert.not(exists("#login-button:visible"), "hides the login button");
});
- test("create account", async (assert) => {
+ test("create account", async function (assert) {
await visit("/");
await click("header .sign-up-button");
@@ -170,7 +170,7 @@ acceptance("Signing In", function () {
);
});
- test("second factor backup - valid token", async (assert) => {
+ test("second factor backup - valid token", async function (assert) {
await visit("/");
await click("header .login-button");
await fillIn("#login-account-name", "eviltrout");
@@ -186,7 +186,7 @@ acceptance("Signing In", function () {
);
});
- test("second factor backup - invalid token", async (assert) => {
+ test("second factor backup - invalid token", async function (assert) {
await visit("/");
await click("header .login-button");
await fillIn("#login-account-name", "eviltrout");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/static-test.js b/app/assets/javascripts/discourse/tests/acceptance/static-test.js
index a0450d8d35..d955e08fe3 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/static-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/static-test.js
@@ -1,10 +1,9 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { visit, currentRouteName } from "@ember/test-helpers";
import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
acceptance("Static", function () {
- test("Static Pages", async (assert) => {
+ test("Static Pages", async function (assert) {
await visit("/faq");
assert.ok($("body.static-faq").length, "has the body class");
assert.ok(exists(".body-page"), "The content is present");
@@ -23,7 +22,7 @@ acceptance("Static", function () {
await visit("/login");
assert.equal(
- currentPath(),
+ currentRouteName(),
"discovery.latest",
"it redirects them to latest unless `login_required`"
);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js b/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js
index ffab0fe849..6c4b2954bb 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/tag-groups-test.js
@@ -35,7 +35,7 @@ acceptance("Tag Groups", function (needs) {
});
});
- test("tag groups can be saved and deleted", async (assert) => {
+ test("tag groups can be saved and deleted", async function (assert) {
const tags = selectKit(".tag-chooser");
await visit("/tag_groups");
@@ -51,7 +51,7 @@ acceptance("Tag Groups", function (needs) {
assert.ok(!queryAll(".tag-group-content .btn.btn-danger")[0].disabled);
});
- test("tag groups can have multiple groups added to them", async (assert) => {
+ test("tag groups can have multiple groups added to them", async function (assert) {
const tags = selectKit(".tag-chooser");
const groups = selectKit(".group-chooser");
@@ -62,12 +62,18 @@ acceptance("Tag Groups", function (needs) {
await tags.expand();
await tags.selectRowByValue("monkey");
- await click("#private-permission");
+ await click("#visible-permission");
assert.ok(queryAll(".tag-group-content .btn.btn-default:disabled").length);
await groups.expand();
await groups.selectRowByIndex(1);
await groups.selectRowByIndex(0);
assert.ok(!queryAll(".tag-group-content .btn.btn-default")[0].disabled);
+
+ await click(".tag-group-content .btn.btn-default");
+ assert.ok(
+ exists("#visible-permission:checked"),
+ "selected permission does not change after saving"
+ );
});
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/tags-intersection-test.js b/app/assets/javascripts/discourse/tests/acceptance/tags-intersection-test.js
index ee69c9f996..3b88f42e7a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/tags-intersection-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/tags-intersection-test.js
@@ -31,7 +31,7 @@ acceptance("Tags intersection", function (needs) {
});
});
- test("Populate tags when creating new topic", async (assert) => {
+ test("Populate tags when creating new topic", async function (assert) {
await visit("/tags/intersection/first/second");
await click("#create-topic");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/tags-test.js b/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
index 5fa41d4207..3dfe952692 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/tags-test.js
@@ -10,7 +10,7 @@ import {
acceptance("Tags", function (needs) {
needs.user();
- test("list the tags", async (assert) => {
+ test("list the tags", async function (assert) {
await visit("/tags");
assert.ok($("body.tags-page").length, "has the body class");
@@ -85,7 +85,7 @@ acceptance("Tags listed by group", function (needs) {
);
});
- test("list the tags in groups", async (assert) => {
+ test("list the tags in groups", async function (assert) {
await visit("/tags");
assert.equal(
$(".tag-list").length,
@@ -126,7 +126,7 @@ acceptance("Tags listed by group", function (needs) {
);
});
- test("new topic button is not available for staff-only tags", async (assert) => {
+ test("new topic button is not available for staff-only tags", async function (assert) {
updateCurrentUser({ moderator: false, admin: false });
await visit("/tag/regular-tag");
@@ -225,7 +225,7 @@ acceptance("Tag info", function (needs) {
);
});
- test("tag info can show synonyms", async (assert) => {
+ test("tag info can show synonyms", async function (assert) {
updateCurrentUser({ moderator: false, admin: false });
await visit("/tag/planters");
@@ -250,7 +250,7 @@ acceptance("Tag info", function (needs) {
assert.ok(!exists("#delete-tag"), "can't delete tag");
});
- test("admin can manage tags", async (assert) => {
+ test("admin can manage tags", async function (assert) {
updateCurrentUser({ moderator: false, admin: true });
await visit("/tag/planters");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-admin-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-admin-menu-test.js
index 141a7f7853..ed6206780f 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-admin-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-admin-menu-test.js
@@ -7,7 +7,7 @@ import {
} from "discourse/tests/helpers/qunit-helpers";
acceptance("Topic - Admin Menu Anonymous Users", function () {
- test("Enter as a regular user", async (assert) => {
+ test("Enter as a regular user", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.ok(exists("#topic"), "The topic was rendered");
assert.ok(
@@ -19,7 +19,7 @@ acceptance("Topic - Admin Menu Anonymous Users", function () {
acceptance("Topic - Admin Menu", function (needs) {
needs.user();
- test("Enter as a user with group moderator permissions", async (assert) => {
+ test("Enter as a user with group moderator permissions", async function (assert) {
updateCurrentUser({ moderator: false, admin: false, trust_level: 1 });
await visit("/t/topic-for-group-moderators/2480");
@@ -28,9 +28,12 @@ acceptance("Topic - Admin Menu", function (needs) {
exists(".toggle-admin-menu"),
"The admin menu button was rendered"
);
+
+ await click(".toggle-admin-menu");
+ assert.ok(exists(".topic-admin-delete"), "The delete item was rendered");
});
- test("Enter as a user with moderator and admin permissions", async (assert) => {
+ test("Enter as a user with moderator and admin permissions", async function (assert) {
updateCurrentUser({ moderator: true, admin: true, trust_level: 4 });
await visit("/t/internationalization-localization/280");
@@ -41,7 +44,7 @@ acceptance("Topic - Admin Menu", function (needs) {
);
});
- test("Toggle the menu as admin focuses the first item", async (assert) => {
+ test("Toggle the menu as admin focuses the first item", async function (assert) {
updateCurrentUser({ admin: true });
await visit("/t/internationalization-localization/280");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-anonymous-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-anonymous-test.js
index 0e56339e87..d538bd7132 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-anonymous-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-anonymous-test.js
@@ -5,7 +5,7 @@ import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Topic - Anonymous", function () {
- test("Enter a Topic", async (assert) => {
+ test("Enter a Topic", async function (assert) {
await visit("/t/internationalization-localization/280/1");
assert.ok(exists("#topic"), "The topic was rendered");
assert.ok(exists("#topic .cooked"), "The topic has cooked posts");
@@ -15,24 +15,24 @@ acceptance("Topic - Anonymous", function () {
);
});
- test("Enter without an id", async (assert) => {
+ test("Enter without an id", async function (assert) {
await visit("/t/internationalization-localization");
assert.ok(exists("#topic"), "The topic was rendered");
});
- test("Enter a 404 topic", async (assert) => {
+ test("Enter a 404 topic", async function (assert) {
await visit("/t/not-found/404");
assert.ok(!exists("#topic"), "The topic was not rendered");
assert.ok(exists(".topic-error"), "An error message is displayed");
});
- test("Enter without access", async (assert) => {
+ test("Enter without access", async function (assert) {
await visit("/t/i-dont-have-access/403");
assert.ok(!exists("#topic"), "The topic was not rendered");
assert.ok(exists(".topic-error"), "An error message is displayed");
});
- test("Enter with 500 errors", async (assert) => {
+ test("Enter with 500 errors", async function (assert) {
await visit("/t/throws-error/500");
assert.ok(!exists("#topic"), "The topic was not rendered");
assert.ok(exists(".topic-error"), "An error message is displayed");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js
index 755b017adf..b706ab2e01 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-discovery-test.js
@@ -13,7 +13,7 @@ acceptance("Topic Discovery", function (needs) {
show_pinned_excerpt_desktop: true,
});
- test("Visit Discovery Pages", async (assert) => {
+ test("Visit Discovery Pages", async function (assert) {
await visit("/");
assert.ok($("body.navigation-topics").length, "has the default navigation");
assert.ok(exists(".topic-list"), "The list of topics was rendered");
@@ -72,7 +72,7 @@ acceptance("Topic Discovery", function (needs) {
);
});
- test("Clearing state after leaving a category", async (assert) => {
+ test("Clearing state after leaving a category", async function (assert) {
await visit("/c/dev");
assert.ok(
exists(".topic-list-item[data-topic-id=11994] .topic-excerpt"),
@@ -85,7 +85,7 @@ acceptance("Topic Discovery", function (needs) {
);
});
- test("Live update unread state", async (assert) => {
+ test("Live update unread state", async function (assert) {
await visit("/");
assert.ok(
exists(".topic-list-item:not(.visited) a[data-topic-id='11995']"),
@@ -114,7 +114,7 @@ acceptance("Topic Discovery", function (needs) {
);
});
- test("Using period chooser when query params are present", async (assert) => {
+ test("Using period chooser when query params are present", async function (assert) {
await visit("/top?f=foo&d=bar");
sinon.stub(DiscourseURL, "routeTo");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
index da35fd8e6e..f9eb57d63e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-edit-timer-test.js
@@ -25,7 +25,7 @@ acceptance("Topic - Edit timer", function (needs) {
);
});
- test("default", async (assert) => {
+ test("default", async function (assert) {
updateCurrentUser({ moderator: true });
const futureDateInputSelector = selectKit(".future-date-input-selector");
@@ -40,7 +40,7 @@ acceptance("Topic - Edit timer", function (needs) {
assert.equal(futureDateInputSelector.header().value(), null);
});
- test("autoclose - specific time", async (assert) => {
+ test("autoclose - specific time", async function (assert) {
updateCurrentUser({ moderator: true });
const futureDateInputSelector = selectKit(".future-date-input-selector");
@@ -61,7 +61,7 @@ acceptance("Topic - Edit timer", function (needs) {
assert.ok(regex.test(html));
});
- skip("autoclose", async (assert) => {
+ skip("autoclose", async function (assert) {
updateCurrentUser({ moderator: true });
const futureDateInputSelector = selectKit(".future-date-input-selector");
@@ -123,7 +123,7 @@ acceptance("Topic - Edit timer", function (needs) {
assert.ok(regex3.test(html3));
});
- test("close temporarily", async (assert) => {
+ test("close temporarily", async function (assert) {
updateCurrentUser({ moderator: true });
const timerType = selectKit(".select-kit.timer-type");
const futureDateInputSelector = selectKit(".future-date-input-selector");
@@ -174,7 +174,7 @@ acceptance("Topic - Edit timer", function (needs) {
assert.ok(regex2.test(html2));
});
- test("schedule", async (assert) => {
+ test("schedule", async function (assert) {
updateCurrentUser({ moderator: true });
const timerType = selectKit(".select-kit.timer-type");
const categoryChooser = selectKit(".modal-body .category-chooser");
@@ -212,7 +212,7 @@ acceptance("Topic - Edit timer", function (needs) {
assert.ok(regex.test(text));
});
- test("TL4 can't auto-delete", async (assert) => {
+ test("TL4 can't auto-delete", async function (assert) {
updateCurrentUser({ moderator: false, admin: false, trust_level: 4 });
await visit("/t/internationalization-localization");
@@ -226,7 +226,7 @@ acceptance("Topic - Edit timer", function (needs) {
assert.ok(!timerType.rowByValue("delete").exists());
});
- test("auto delete", async (assert) => {
+ test("auto delete", async function (assert) {
updateCurrentUser({ moderator: true });
const timerType = selectKit(".select-kit.timer-type");
const futureDateInputSelector = selectKit(".future-date-input-selector");
@@ -257,7 +257,7 @@ acceptance("Topic - Edit timer", function (needs) {
assert.ok(regex.test(html));
});
- test("Inline delete timer", async (assert) => {
+ test("Inline delete timer", async function (assert) {
updateCurrentUser({ moderator: true });
const futureDateInputSelector = selectKit(".future-date-input-selector");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-footer-buttons-mobile-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-footer-buttons-mobile-test.js
index f64412210d..1950e23d2c 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-footer-buttons-mobile-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-footer-buttons-mobile-test.js
@@ -37,7 +37,7 @@ acceptance("Topic footer buttons mobile", function (needs) {
_test = undefined;
});
- test("default", async (assert) => {
+ test("default", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.equal(_test, null);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-list-tracker-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-list-tracker-test.js
index b799fa071e..4b3cb170e9 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-list-tracker-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-list-tracker-test.js
@@ -8,7 +8,7 @@ import {
} from "discourse/lib/topic-list-tracker";
acceptance("Topic list tracking", function () {
- test("Navigation", async (assert) => {
+ test("Navigation", async function (assert) {
await visit("/");
let url = await nextTopicUrl();
assert.equal(url, "/t/error-after-upgrade-to-0-9-7-9/11557");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js
index d0f15e24ef..fa9de352e8 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-move-posts-test.js
@@ -7,7 +7,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Topic move posts", function (needs) {
needs.user();
- test("default", async (assert) => {
+ test("default", async function (assert) {
await visit("/t/internationalization-localization");
await click(".toggle-admin-menu");
await click(".topic-admin-multi-select .btn");
@@ -50,7 +50,7 @@ acceptance("Topic move posts", function (needs) {
);
});
- test("moving all posts", async (assert) => {
+ test("moving all posts", async function (assert) {
await visit("/t/internationalization-localization");
await click(".toggle-admin-menu");
await click(".topic-admin-multi-select .btn");
@@ -86,7 +86,7 @@ acceptance("Topic move posts", function (needs) {
);
});
- test("moving posts from personal message", async (assert) => {
+ test("moving posts from personal message", async function (assert) {
await visit("/t/pm-for-testing/12");
await click(".toggle-admin-menu");
await click(".topic-admin-multi-select .btn");
@@ -122,7 +122,7 @@ acceptance("Topic move posts", function (needs) {
);
});
- test("group moderator moving posts", async (assert) => {
+ test("group moderator moving posts", async function (assert) {
await visit("/t/topic-for-group-moderators/2480");
await click(".toggle-admin-menu");
await click(".topic-admin-multi-select .btn");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
index 68be05e833..8b36d5211a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-notifications-button-test.js
@@ -12,7 +12,7 @@ acceptance("Topic Notifications button", function (needs) {
});
});
- test("Updating topic notification level", async (assert) => {
+ test("Updating topic notification level", async function (assert) {
const notificationOptions = selectKit(
"#topic-footer-buttons .topic-notifications-options"
);
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js
index bb4e6ffc2a..f85d400bf7 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-quote-button-test.js
@@ -22,7 +22,7 @@ acceptance("Topic - Quote button - logged in", function (needs) {
share_quote_buttons: "twitter|email",
});
- test("Does not show the quote share buttons by default", async (assert) => {
+ test("Does not show the quote share buttons by default", async function (assert) {
await visit("/t/internationalization-localization/280");
selectText("#post_5 blockquote");
assert.ok(exists(".insert-quote"), "it shows the quote button");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
index 34182e32eb..7b8b35ff78 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js
@@ -1,6 +1,6 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { click, fillIn, visit } from "@ember/test-helpers";
+import { click, triggerKeyEvent, fillIn, visit } from "@ember/test-helpers";
import { test } from "qunit";
import I18n from "I18n";
import { withPluginApi } from "discourse/lib/plugin-api";
@@ -26,7 +26,7 @@ acceptance("Topic", function (needs) {
});
});
- test("Reply as new topic", async (assert) => {
+ test("Reply as new topic", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("button.share:eq(0)");
await click(".reply-as-new-topic a");
@@ -45,7 +45,7 @@ acceptance("Topic", function (needs) {
);
});
- test("Reply as new message", async (assert) => {
+ test("Reply as new message", async function (assert) {
await visit("/t/pm-for-testing/12");
await click("button.share:eq(0)");
await click(".reply-as-new-topic a");
@@ -79,14 +79,14 @@ acceptance("Topic", function (needs) {
);
});
- test("Share Modal", async (assert) => {
+ test("Share Modal", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".topic-post:first-child button.share");
assert.ok(exists("#share-link"), "it shows the share modal");
});
- test("Showing and hiding the edit controls", async (assert) => {
+ test("Showing and hiding the edit controls", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-title .d-icon-pencil-alt");
@@ -102,7 +102,7 @@ acceptance("Topic", function (needs) {
assert.ok(!exists("#edit-title"), "it hides the editing controls");
});
- test("Updating the topic title and category", async (assert) => {
+ test("Updating the topic title and category", async function (assert) {
const categoryChooser = selectKit(".title-wrapper .category-chooser");
await visit("/t/internationalization-localization/280");
@@ -125,7 +125,7 @@ acceptance("Topic", function (needs) {
);
});
- test("Marking a topic as wiki", async (assert) => {
+ test("Marking a topic as wiki", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.ok(
@@ -140,7 +140,7 @@ acceptance("Topic", function (needs) {
assert.ok(queryAll("a.wiki").length === 1, "it shows the wiki icon");
});
- test("Visit topic routes", async (assert) => {
+ test("Visit topic routes", async function (assert) {
await visit("/t/12");
assert.equal(
@@ -158,7 +158,7 @@ acceptance("Topic", function (needs) {
);
});
- test("Updating the topic title with emojis", async (assert) => {
+ test("Updating the topic title with emojis", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-title .d-icon-pencil-alt");
@@ -173,7 +173,7 @@ acceptance("Topic", function (needs) {
);
});
- test("Updating the topic title with unicode emojis", async (assert) => {
+ test("Updating the topic title with unicode emojis", async function (assert) {
await visit("/t/internationalization-localization/280");
await click("#topic-title .d-icon-pencil-alt");
@@ -204,7 +204,7 @@ acceptance("Topic", function (needs) {
);
});
- test("Suggested topics", async (assert) => {
+ test("Suggested topics", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.equal(
@@ -213,7 +213,7 @@ acceptance("Topic", function (needs) {
);
});
- test("Deleting a topic", async (assert) => {
+ test("Deleting a topic", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".topic-post:eq(0) button.show-more-actions");
await click(".widget-button.delete");
@@ -242,7 +242,7 @@ acceptance("Topic", function (needs) {
assert.ok(exists(".topic-admin-recover"), "it shows the recover button");
});
- test("Group category moderator posts", async (assert) => {
+ test("Group category moderator posts", async function (assert) {
await visit("/t/topic-for-group-moderators/2480");
assert.ok(exists(".category-moderator"), "it has a class applied");
@@ -256,7 +256,7 @@ acceptance("Topic featured links", function (needs) {
topic_featured_link_enabled: true,
max_topic_title_length: 80,
});
- test("remove featured link", async (assert) => {
+ test("remove featured link", async function (assert) {
await visit("/t/-/299/1");
assert.ok(
exists(".title-wrapper .topic-featured-link"),
@@ -274,7 +274,7 @@ acceptance("Topic featured links", function (needs) {
assert.ok(!exists(".title-wrapper .topic-featured-link"), "link is gone");
});
- test("Converting to a public topic", async (assert) => {
+ test("Converting to a public topic", async function (assert) {
await visit("/t/test-pm/34");
assert.ok(exists(".private_message"));
await click(".toggle-admin-menu");
@@ -290,7 +290,7 @@ acceptance("Topic featured links", function (needs) {
assert.ok(!exists(".private_message"));
});
- test("Unpinning unlisted topic", async (assert) => {
+ test("Unpinning unlisted topic", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".toggle-admin-menu");
@@ -307,7 +307,7 @@ acceptance("Topic featured links", function (needs) {
);
});
- test("selecting posts", async (assert) => {
+ test("selecting posts", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".toggle-admin-menu");
await click(".topic-admin-multi-select .btn");
@@ -323,7 +323,7 @@ acceptance("Topic featured links", function (needs) {
);
});
- test("select below", async (assert) => {
+ test("select below", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".toggle-admin-menu");
await click(".topic-admin-multi-select .btn");
@@ -346,14 +346,14 @@ acceptance("Topic featured links", function (needs) {
);
});
- test("View Hidden Replies", async (assert) => {
+ test("View Hidden Replies", async function (assert) {
await visit("/t/internationalization-localization/280");
await click(".gap");
assert.equal(queryAll(".gap").length, 0, "it hides gap");
});
- test("Quoting a quote keeps the original poster name", async (assert) => {
+ test("Quoting a quote keeps the original poster name", async function (assert) {
await visit("/t/internationalization-localization/280");
selectText("#post_5 blockquote");
await click(".quote-button .insert-quote");
@@ -365,7 +365,7 @@ acceptance("Topic featured links", function (needs) {
);
});
- test("Quoting a quote of a different topic keeps the original topic title", async (assert) => {
+ test("Quoting a quote of a different topic keeps the original topic title", async function (assert) {
await visit("/t/internationalization-localization/280");
selectText("#post_9 blockquote");
await click(".quote-button .insert-quote");
@@ -379,7 +379,7 @@ acceptance("Topic featured links", function (needs) {
);
});
- test("Quoting a quote with the Reply button keeps the original poster name", async (assert) => {
+ test("Quoting a quote with the Reply button keeps the original poster name", async function (assert) {
await visit("/t/internationalization-localization/280");
selectText("#post_5 blockquote");
await click(".reply");
@@ -391,11 +391,11 @@ acceptance("Topic featured links", function (needs) {
);
});
- test("Quoting a quote with replyAsNewTopic keeps the original poster name", async (assert) => {
+ test("Quoting a quote with replyAsNewTopic keeps the original poster name", async function (assert) {
await visit("/t/internationalization-localization/280");
selectText("#post_5 blockquote");
- await keyEvent(document, "keypress", "j".charCodeAt(0));
- await keyEvent(document, "keypress", "t".charCodeAt(0));
+ await triggerKeyEvent(document, "keypress", "j".charCodeAt(0));
+ await triggerKeyEvent(document, "keypress", "t".charCodeAt(0));
assert.ok(
queryAll(".d-editor-input")
@@ -404,7 +404,7 @@ acceptance("Topic featured links", function (needs) {
);
});
- test("Quoting by selecting text can mark the quote as full", async (assert) => {
+ test("Quoting by selecting text can mark the quote as full", async function (assert) {
await visit("/t/internationalization-localization/280");
selectText("#post_5 .cooked");
await click(".quote-button .insert-quote");
@@ -426,7 +426,7 @@ acceptance("Topic with title decorated", function (needs) {
});
});
});
- test("Decorate topic title", async (assert) => {
+ test("Decorate topic title", async function (assert) {
await visit("/t/internationalization-localization/280");
assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/unknown-test.js b/app/assets/javascripts/discourse/tests/acceptance/unknown-test.js
index 764d3875c1..7c4074a17d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/unknown-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/unknown-test.js
@@ -27,17 +27,17 @@ acceptance("Unknown", function (needs) {
});
});
- test("Permalink Unknown URL", async (assert) => {
+ test("Permalink Unknown URL", async function (assert) {
await visit("/url-that-doesn't-exist");
assert.ok(exists(".page-not-found"), "The not found content is present");
});
- test("Permalink URL to a Topic", async (assert) => {
+ test("Permalink URL to a Topic", async function (assert) {
await visit("/viewtopic.php?f=8&t=280");
assert.equal(currentURL(), "/t/internationalization-localization/280");
});
- test("Permalink URL to a static page", async (assert) => {
+ test("Permalink URL to a static page", async function (assert) {
await visit("/not-the-url-for-faq");
assert.equal(currentURL(), "/faq");
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-anonymous-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-anonymous-test.js
index ad2218e3b0..78b6339456 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-anonymous-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-anonymous-test.js
@@ -1,16 +1,19 @@
-import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { visit, currentURL } from "@ember/test-helpers";
+import { visit, currentURL, currentRouteName } from "@ember/test-helpers";
import { test } from "qunit";
-import { acceptance, count } from "discourse/tests/helpers/qunit-helpers";
+import {
+ acceptance,
+ count,
+ exists,
+} from "discourse/tests/helpers/qunit-helpers";
acceptance("User Anonymous", function () {
- test("Root URL", async (assert) => {
+ test("Root URL", async function (assert) {
await visit("/u/eviltrout");
assert.ok($("body.user-summary-page").length, "has the body class");
- assert.equal(currentPath(), "user.summary", "it defaults to summary");
+ assert.equal(currentRouteName(), "user.summary", "it defaults to summary");
});
- test("Filters", async (assert) => {
+ test("Filters", async function (assert) {
await visit("/u/eviltrout/activity");
assert.ok($("body.user-activity-page").length, "has the body class");
assert.ok(exists(".user-main .about"), "it has the about section");
@@ -27,13 +30,13 @@ acceptance("User Anonymous", function () {
assert.ok(exists(".user-stream.filter-5"), "stream has filter class");
});
- test("Badges", async (assert) => {
+ test("Badges", async function (assert) {
await visit("/u/eviltrout/badges");
assert.ok($("body.user-badges-page").length, "has the body class");
assert.ok(exists(".user-badges-list .badge-card"), "shows a badge");
});
- test("Restricted Routes", async (assert) => {
+ test("Restricted Routes", async function (assert) {
await visit("/u/eviltrout/preferences");
assert.equal(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js
index ef54c4dd27..75225c360a 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-bookmarks-test.js
@@ -10,7 +10,7 @@ import { cloneJSON } from "discourse-common/lib/object";
acceptance("User's bookmarks", function (needs) {
needs.user();
- test("removing a bookmark with no reminder does not show a confirmation", async (assert) => {
+ test("removing a bookmark with no reminder does not show a confirmation", async function (assert) {
await visit("/u/eviltrout/activity/bookmarks");
assert.ok(queryAll(".bookmark-list-item").length > 0);
@@ -33,7 +33,7 @@ acceptance("User's bookmarks - reminder", function (needs) {
});
});
- test("removing a bookmark with a reminder shows a confirmation", async (assert) => {
+ test("removing a bookmark with a reminder shows a confirmation", async function (assert) {
await visit("/u/eviltrout/activity/bookmarks");
const dropdown = selectKit(".bookmark-actions-dropdown");
@@ -58,7 +58,7 @@ acceptance("User's bookmarks - no bookmarks", function (needs) {
);
});
- test("listing users bookmarks - no bookmarks", async (assert) => {
+ test("listing users bookmarks - no bookmarks", async function (assert) {
await visit("/u/eviltrout/activity/bookmarks");
assert.equal(queryAll(".alert.alert-info").text(), "no bookmarks");
});
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
index 90ca96785f..14bf3baabc 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js
@@ -15,7 +15,7 @@ acceptance("User Card - Show Local Time", function (needs) {
server.get("/u/charlie/card.json", () => helper.response(cardResponse));
});
- test("user card local time - does not update timezone for another user", async (assert) => {
+ test("user card local time - does not update timezone for another user", async function (assert) {
User.current().changeTimezone("Australia/Brisbane");
await visit("/t/internationalization-localization/280");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js
index dd88a1826d..c5161235ca 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-drafts-stream-test.js
@@ -1,24 +1,27 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { visit } from "@ember/test-helpers";
import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import { acceptance, visible } from "discourse/tests/helpers/qunit-helpers";
import { click } from "@ember/test-helpers";
acceptance("User Drafts", function (needs) {
needs.user();
- test("Stream", async (assert) => {
+ test("Stream", async function (assert) {
await visit("/u/eviltrout/activity/drafts");
assert.ok(queryAll(".user-stream-item").length === 3, "has drafts");
await click(".user-stream-item:last-child .remove-draft");
+ assert.ok(visible(".bootbox"));
+
+ await click(".bootbox .btn-primary");
assert.ok(
queryAll(".user-stream-item").length === 2,
"draft removed, list length diminished by one"
);
});
- test("Stream - resume draft", async (assert) => {
+ test("Stream - resume draft", async function (assert) {
await visit("/u/eviltrout/activity/drafts");
assert.ok(queryAll(".user-stream-item").length > 0, "has drafts");
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js
index 75585eb55e..7bdd500f66 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-preferences-interface-test.js
@@ -12,7 +12,7 @@ import { click } from "@ember/test-helpers";
acceptance("User Preferences - Interface", function (needs) {
needs.user();
- test("font size change", async (assert) => {
+ test("font size change", async function (assert) {
removeCookie("text_size");
const savePreferences = async () => {
@@ -57,12 +57,12 @@ acceptance("User Preferences - Interface", function (needs) {
removeCookie("text_size");
});
- test("does not show option to disable dark mode by default", async (assert) => {
+ test("does not show option to disable dark mode by default", async function (assert) {
await visit("/u/eviltrout/preferences/interface");
assert.equal($(".control-group.dark-mode").length, 0);
});
- test("shows light/dark color scheme pickers", async (assert) => {
+ test("shows light/dark color scheme pickers", async function (assert) {
let site = Site.current();
site.set("user_color_schemes", [
{ id: 2, name: "Cool Breeze" },
@@ -88,7 +88,7 @@ acceptance(
});
});
- test("show option to disable dark mode", async (assert) => {
+ test("show option to disable dark mode", async function (assert) {
await visit("/u/eviltrout/preferences/interface");
assert.ok(
@@ -97,7 +97,7 @@ acceptance(
);
});
- test("no color scheme picker by default", async (assert) => {
+ test("no color scheme picker by default", async function (assert) {
let site = Site.current();
site.set("user_color_schemes", []);
@@ -105,7 +105,7 @@ acceptance(
assert.equal($(".control-group.color-scheme").length, 0);
});
- test("light color scheme picker", async (assert) => {
+ test("light color scheme picker", async function (assert) {
let site = Site.current();
site.set("user_color_schemes", [{ id: 2, name: "Cool Breeze" }]);
@@ -118,7 +118,7 @@ acceptance(
);
});
- test("light and dark color scheme pickers", async (assert) => {
+ test("light and dark color scheme pickers", async function (assert) {
let site = Site.current();
let session = Session.current();
session.userDarkSchemeId = 1; // same as default set in site settings
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
index be6c806ea7..d381245321 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
@@ -1,8 +1,10 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { exists } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
+import { visit, currentRouteName } from "@ember/test-helpers";
import { test } from "qunit";
-import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import {
+ acceptance,
+ exists,
+ queryAll,
+} from "discourse/tests/helpers/qunit-helpers";
import { click } from "@ember/test-helpers";
acceptance("User Routes", function (needs) {
@@ -13,29 +15,29 @@ acceptance("User Routes", function (needs) {
helper.response(400, {})
);
});
- test("Invalid usernames", async (assert) => {
+ test("Invalid usernames", async function (assert) {
await visit("/u/eviltrout%2F..%2F..%2F/summary");
- assert.equal(currentPath(), "exception-unknown");
+ assert.equal(currentRouteName(), "exception-unknown");
});
- test("Unicode usernames", async (assert) => {
+ test("Unicode usernames", async function (assert) {
await visit("/u/%E3%83%A9%E3%82%A4%E3%82%AA%E3%83%B3/summary");
- assert.equal(currentPath(), "user.summary");
+ assert.equal(currentRouteName(), "user.summary");
});
- test("Invites", async (assert) => {
+ test("Invites", async function (assert) {
await visit("/u/eviltrout/invited/pending");
assert.ok($("body.user-invites-page").length, "has the body class");
});
- test("Messages", async (assert) => {
+ test("Messages", async function (assert) {
await visit("/u/eviltrout/messages");
assert.ok($("body.user-messages-page").length, "has the body class");
});
- test("Notifications", async (assert) => {
+ test("Notifications", async function (assert) {
await visit("/u/eviltrout/notifications");
assert.ok($("body.user-notifications-page").length, "has the body class");
@@ -48,18 +50,18 @@ acceptance("User Routes", function (needs) {
);
});
- test("Root URL - Viewing Self", async (assert) => {
+ test("Root URL - Viewing Self", async function (assert) {
await visit("/u/eviltrout");
assert.ok($("body.user-activity-page").length, "has the body class");
assert.equal(
- currentPath(),
- "user.userActivity.index",
+ currentRouteName(),
+ "userActivity.index",
"it defaults to activity"
);
assert.ok(exists(".container.viewing-self"), "has the viewing-self class");
});
- test("Viewing Summary", async (assert) => {
+ test("Viewing Summary", async function (assert) {
await visit("/u/eviltrout/summary");
assert.ok(exists(".replies-section li a"), "replies");
@@ -75,7 +77,7 @@ acceptance("User Routes", function (needs) {
);
});
- test("Viewing Drafts", async (assert) => {
+ test("Viewing Drafts", async function (assert) {
await visit("/u/eviltrout/activity/drafts");
assert.ok(exists(".user-stream"), "has drafts stream");
assert.ok(
diff --git a/app/assets/javascripts/discourse/tests/acceptance/users-test.js b/app/assets/javascripts/discourse/tests/acceptance/users-test.js
index 593100837d..679410d241 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/users-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/users-test.js
@@ -4,24 +4,24 @@ import { test } from "qunit";
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("User Directory", function () {
- test("Visit Page", async (assert) => {
+ test("Visit Page", async function (assert) {
await visit("/u");
assert.ok($("body.users-page").length, "has the body class");
assert.ok(exists(".directory table tr"), "has a list of users");
});
- test("Visit All Time", async (assert) => {
+ test("Visit All Time", async function (assert) {
await visit("/u?period=all");
assert.ok(exists(".time-read"), "has time read column");
});
- test("Visit Without Usernames", async (assert) => {
+ test("Visit Without Usernames", async function (assert) {
await visit("/u?exclude_usernames=system");
assert.ok($("body.users-page").length, "has the body class");
assert.ok(exists(".directory table tr"), "has a list of users");
});
- test("Visit With Group Filter", async (assert) => {
+ test("Visit With Group Filter", async function (assert) {
await visit("/u?group=trust_level_0");
assert.ok($("body.users-page").length, "has the body class");
assert.ok(exists(".directory table tr"), "has a list of users");
diff --git a/app/assets/javascripts/discourse/tests/fixtures/topic.js b/app/assets/javascripts/discourse/tests/fixtures/topic.js
index 2409a38f83..2f4a97a684 100644
--- a/app/assets/javascripts/discourse/tests/fixtures/topic.js
+++ b/app/assets/javascripts/discourse/tests/fixtures/topic.js
@@ -5174,7 +5174,7 @@ export default {
edit_reason: null,
can_view_edit_history: true,
wiki: false,
- notice_type: "new-user",
+ notice: { type: "new_user" }
},
],
stream: [25, 26, 27],
@@ -5583,6 +5583,7 @@ export default {
details: {
notification_level: 3,
notifications_reason_id: 1,
+ can_delete: true,
can_edit: true,
can_create_post: true,
can_move_posts: true,
@@ -5593,6 +5594,7 @@ export default {
can_archive_topic: true,
can_split_merge_topic: true,
can_edit_staff_notes: true,
+ can_moderate_category: true,
participants: [
{
id: 3,
diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index 11a9d5f7f2..7776186da1 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -32,7 +32,6 @@ import { getOwner } from "discourse-common/lib/get-owner";
import { setTopicList } from "discourse/lib/topic-list-tracker";
import { setURLContainer } from "discourse/lib/url";
import { setDefaultOwner } from "discourse-common/lib/get-owner";
-import bootbox from "bootbox";
import { moduleFor } from "ember-qunit";
import QUnit, { module } from "qunit";
import siteFixtures from "discourse/tests/fixtures/site-fixtures";
@@ -68,36 +67,6 @@ export function fakeTime(timeString, timezone = null, advanceTime = false) {
});
}
-const Plugin = $.fn.modal;
-const Modal = Plugin.Constructor;
-
-function AcceptanceModal(option, _relatedTarget) {
- return this.each(function () {
- var $this = $(this);
- var data = $this.data("bs.modal");
- var options = $.extend(
- {},
- Modal.DEFAULTS,
- $this.data(),
- typeof option === "object" && option
- );
-
- if (!data) {
- $this.data("bs.modal", (data = new Modal(this, options)));
- }
- data.$body = $("#ember-testing");
-
- if (typeof option === "string") {
- data[option](_relatedTarget);
- } else if (options.show) {
- data.show(_relatedTarget);
- }
- });
-}
-
-bootbox.$body = $("#ember-testing");
-$.fn.modal = AcceptanceModal;
-
let _pretenderCallbacks = {};
export function resetSite(siteSettings, extras) {
@@ -128,18 +97,39 @@ export function controllerModule(name, args = {}) {
});
}
-export function discourseModule(name, hooks) {
+export function discourseModule(name, options) {
+ // deprecated(
+ // `${name}: \`discourseModule\` is deprecated. Use QUnit's \`module\` instead.`,
+ // { since: "2.6.0" }
+ // );
+
+ if (typeof options === "function") {
+ module(name, function (hooks) {
+ hooks.beforeEach(function () {
+ this.container = getOwner(this);
+ this.registry = this.container.registry;
+
+ this.owner = this.container;
+ this.siteSettings = currentSettings();
+ });
+
+ options.call(this, hooks);
+ });
+
+ return;
+ }
+
module(name, {
beforeEach() {
this.container = getOwner(this);
this.siteSettings = currentSettings();
- if (hooks && hooks.beforeEach) {
- hooks.beforeEach.call(this);
+ if (options && options.beforeEach) {
+ options.beforeEach.call(this);
}
},
afterEach() {
- if (hooks && hooks.afterEach) {
- hooks.afterEach.call(this);
+ if (options && options.afterEach) {
+ options.afterEach.call(this);
}
},
});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
index 5fdb95bbd0..86ba4c800a 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js
@@ -84,6 +84,7 @@ function composerTestCase(title, testFunc) {
beforeEach() {
this.set("value", "hello world.");
},
+
test(assert) {
const textarea = jumpEnd(queryAll("textarea.d-editor-input")[0]);
testFunc.call(this, assert, textarea);
@@ -682,6 +683,26 @@ composerTestCase("replace-text event for composer", async function (assert) {
assert.equal(this.value, "red yellow blue");
});
+function paste(element, text) {
+ let e = new Event("paste");
+ e.clipboardData = { getData: () => text };
+ element.dispatchEvent(e);
+}
+
+componentTest("paste table", {
+ template: "{{d-editor value=value composerEvents=true}}",
+ beforeEach() {
+ this.set("value", "");
+ this.siteSettings.enable_rich_text_paste = true;
+ },
+
+ async test(assert) {
+ let element = queryAll(".d-editor")[0];
+ await paste(element, "\ta\tb\n1\t2\t3");
+ assert.equal(this.value, "||a|b|\n|---|---|---|\n|1|2|3|\n");
+ },
+});
+
(() => {
// Tests to check cursor/selection after replace-text event.
const BEFORE = "red green blue";
diff --git a/app/assets/javascripts/discourse/tests/integration/components/keyboard-shortcuts-test.js b/app/assets/javascripts/discourse/tests/integration/components/keyboard-shortcuts-test.js
index ea66079fb4..4ec83d19ca 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/keyboard-shortcuts-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/keyboard-shortcuts-test.js
@@ -117,21 +117,21 @@ Object.keys(functionBindings).forEach((func) => {
});
});
-test("selectDown calls _moveSelection with 1", (assert) => {
+test("selectDown calls _moveSelection with 1", function (assert) {
let stub = sinon.stub(KeyboardShortcuts, "_moveSelection");
KeyboardShortcuts.selectDown();
assert.ok(stub.calledWith(1), "_moveSelection is called with 1");
});
-test("selectUp calls _moveSelection with -1", (assert) => {
+test("selectUp calls _moveSelection with -1", function (assert) {
let stub = sinon.stub(KeyboardShortcuts, "_moveSelection");
KeyboardShortcuts.selectUp();
assert.ok(stub.calledWith(-1), "_moveSelection is called with -1");
});
-test("goBack calls history.back", (assert) => {
+test("goBack calls history.back", function (assert) {
let called = false;
sinon.stub(history, "back").callsFake(function () {
called = true;
@@ -141,14 +141,14 @@ test("goBack calls history.back", (assert) => {
assert.ok(called, "history.back is called");
});
-test("nextSection calls _changeSection with 1", (assert) => {
+test("nextSection calls _changeSection with 1", function (assert) {
let spy = sinon.spy(KeyboardShortcuts, "_changeSection");
KeyboardShortcuts.nextSection();
assert.ok(spy.calledWith(1), "_changeSection is called with 1");
});
-test("prevSection calls _changeSection with -1", (assert) => {
+test("prevSection calls _changeSection with -1", function (assert) {
let spy = sinon.spy(KeyboardShortcuts, "_changeSection");
KeyboardShortcuts.prevSection();
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
index 7f722fb5a6..2327492ed7 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js
@@ -168,22 +168,15 @@ componentTest("filter works with non english characters", {
template: `
{{category-chooser
value=value
- content=content
}}
`,
beforeEach() {
const store = createStore();
- const nonEnglishCat = store.createRecord("category", {
+ store.createRecord("category", {
id: 1,
name: "chữ Quốc ngữ",
});
- const englishCat = store.createRecord("category", {
- id: 2,
- name: "Baz",
- });
-
- this.set("content", [nonEnglishCat, englishCat]);
},
async test(assert) {
@@ -199,19 +192,17 @@ componentTest("decodes entities in row title", {
template: `
{{category-chooser
value=value
- content=content
+ options=(hash scopedCategoryId=1)
}}
`,
beforeEach() {
const store = createStore();
- const catWithEntities = store.createRecord("category", {
+ store.createRecord("category", {
id: 1,
name: "cat-with-entities",
description: "baz "bar ‘foo’",
});
-
- this.set("content", [catWithEntities]);
},
async test(assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/share-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/share-button-test.js
deleted file mode 100644
index fbac3c96b3..0000000000
--- a/app/assets/javascripts/discourse/tests/integration/components/share-button-test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { moduleForComponent } from "ember-qunit";
-import componentTest from "discourse/tests/helpers/component-test";
-
-moduleForComponent("share-button", { integration: true });
-
-componentTest("share button", {
- template: '{{share-button url="https://eviltrout.com"}}',
-
- test(assert) {
- assert.ok(queryAll(`button.share`).length, "it has all the classes");
-
- assert.ok(
- queryAll('button[data-share-url="https://eviltrout.com"]').length,
- "it has the data attribute for sharing"
- );
- },
-});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/share-button.js b/app/assets/javascripts/discourse/tests/integration/components/share-button.js
deleted file mode 100644
index 9e267d4bd6..0000000000
--- a/app/assets/javascripts/discourse/tests/integration/components/share-button.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Button from "discourse/components/d-button";
-
-export default Button.extend({
- classNames: ["btn-default", "share"],
- icon: "link",
- title: "topic.share.help",
- label: "topic.share.title",
- attributeBindings: ["url:data-share-url"],
-
- click() {
- return true;
- },
-});
diff --git a/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js
index be67b6beec..75ccc2e122 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js
@@ -1,7 +1,7 @@
import { queryAll } from "discourse/tests/helpers/qunit-helpers";
import { moduleForComponent } from "ember-qunit";
import componentTest from "discourse/tests/helpers/component-test";
-import { click, fillIn } from "@ember/test-helpers";
+import { click, triggerKeyEvent, fillIn } from "@ember/test-helpers";
moduleForComponent("simple-list", { integration: true });
@@ -33,7 +33,7 @@ componentTest("adding a value", {
);
await fillIn(".add-value-input", "eviltrout");
- await keyEvent(".add-value-input", "keydown", 13); // enter
+ await triggerKeyEvent(".add-value-input", "keydown", 13); // enter
assert.ok(
queryAll(".values .value").length === 4,
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js
index 51210b3589..b85f37e1d1 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/post-test.js
@@ -934,11 +934,13 @@ widgetTest("post notice - with username", {
this.siteSettings.prioritize_username_in_ux = true;
this.siteSettings.old_post_notice_days = 14;
this.set("args", {
- noticeType: "returning_user",
- noticeTime: twoDaysAgo,
username: "codinghorror",
name: "Jeff",
created_at: new Date(),
+ notice: {
+ type: "returning_user",
+ lastPostedAt: twoDaysAgo,
+ },
});
},
test(assert) {
@@ -959,10 +961,10 @@ widgetTest("post notice - with name", {
this.siteSettings.prioritize_username_in_ux = false;
this.siteSettings.old_post_notice_days = 14;
this.set("args", {
- noticeType: "new_user",
username: "codinghorror",
name: "Jeff",
created_at: new Date(2019, 0, 1),
+ notice: { type: "new_user" },
});
},
test(assert) {
diff --git a/app/assets/javascripts/discourse/tests/integration/widgets/topic-admin-menu-test.js b/app/assets/javascripts/discourse/tests/integration/widgets/topic-admin-menu-test.js
index db27290241..a3c1b3b29c 100644
--- a/app/assets/javascripts/discourse/tests/integration/widgets/topic-admin-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/widgets/topic-admin-menu-test.js
@@ -37,7 +37,7 @@ widgetTest("topic-admin-menu-button is present for admin/moderators", {
id: 123,
});
const topic = Topic.create({ user_id: this.currentUser.id });
- topic.category = Category.create({ read_restricted: true });
+ topic.set("category_id", Category.create({ read_restricted: true }).id);
this.siteSettings.allow_featured_topic_on_user_profiles = true;
this.set("args", createArgs(topic));
},
@@ -59,7 +59,7 @@ widgetTest(
id: 123,
});
const topic = Topic.create({ user_id: this.currentUser.id });
- topic.category = Category.create({ read_restricted: true });
+ topic.set("category_id", Category.create({ read_restricted: true }).id);
this.siteSettings.allow_featured_topic_on_user_profiles = true;
this.set("args", createArgs(topic));
},
diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js
index bbea851ab3..d4405bc2a8 100644
--- a/app/assets/javascripts/discourse/tests/setup-tests.js
+++ b/app/assets/javascripts/discourse/tests/setup-tests.js
@@ -26,6 +26,34 @@ import MessageBus from "message-bus-client";
import deprecated from "discourse-common/lib/deprecated";
import sinon from "sinon";
import { setApplication, setResolver } from "@ember/test-helpers";
+import bootbox from "bootbox";
+
+const Plugin = $.fn.modal;
+const Modal = Plugin.Constructor;
+
+function AcceptanceModal(option, _relatedTarget) {
+ return this.each(function () {
+ var $this = $(this);
+ var data = $this.data("bs.modal");
+ var options = $.extend(
+ {},
+ Modal.DEFAULTS,
+ $this.data(),
+ typeof option === "object" && option
+ );
+
+ if (!data) {
+ $this.data("bs.modal", (data = new Modal(this, options)));
+ }
+ data.$body = $("#ember-testing");
+
+ if (typeof option === "string") {
+ data[option](_relatedTarget);
+ } else if (options.show) {
+ data.show(_relatedTarget);
+ }
+ });
+}
export default function setupTests(app, container) {
setResolver(buildResolver("discourse").create({ namespace: app }));
@@ -45,6 +73,8 @@ export default function setupTests(app, container) {
app.setupForTesting();
app.SiteSettings = currentSettings();
app.start();
+ bootbox.$body = $("#ember-testing");
+ $.fn.modal = AcceptanceModal;
// disable logster error reporting
if (window.Logster) {
@@ -76,7 +106,7 @@ export default function setupTests(app, container) {
dropFrom: "2.6.0",
}
);
- return window.sinon;
+ return sinon;
},
});
Object.defineProperty(window, "exists", {
@@ -121,7 +151,8 @@ export default function setupTests(app, container) {
const error =
"Unhandled request in test environment: " + path + " (" + verb + ")";
- window.console.error(error);
+ // eslint-disable-next-line no-console
+ console.error(error);
throw new Error(error);
};
@@ -144,16 +175,16 @@ export default function setupTests(app, container) {
PreloadStore.reset();
- window.sinon.stub(ScrollingDOMMethods, "screenNotFull");
- window.sinon.stub(ScrollingDOMMethods, "bindOnScroll");
- window.sinon.stub(ScrollingDOMMethods, "unbindOnScroll");
+ sinon.stub(ScrollingDOMMethods, "screenNotFull");
+ sinon.stub(ScrollingDOMMethods, "bindOnScroll");
+ sinon.stub(ScrollingDOMMethods, "unbindOnScroll");
// Unless we ever need to test this, let's leave it off.
$.fn.autocomplete = function () {};
});
QUnit.testDone(function () {
- window.sinon.restore();
+ sinon.restore();
// Destroy any modals
$(".modal-backdrop").remove();
@@ -166,7 +197,6 @@ export default function setupTests(app, container) {
MessageBus.unsubscribe("*");
server = null;
- window.Mousetrap.reset();
});
// Load ES6 tests
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js
index aff8c19d28..7a88c1e119 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/avatar-selector-test.js
@@ -1,48 +1,49 @@
import EmberObject from "@ember/object";
import { mapRoutes } from "discourse/mapping-router";
-import { moduleFor } from "ember-qunit";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
import { test } from "qunit";
-moduleFor("controller:avatar-selector", "controller:avatar-selector", {
- beforeEach() {
+discourseModule("Unit | Controller | avatar-selector", function (hooks) {
+ hooks.beforeEach(function () {
this.registry.register("router:main", mapRoutes());
- },
- needs: ["controller:modal"],
-});
-
-test("avatarTemplate", function (assert) {
- const avatarSelectorController = this.subject();
-
- const user = EmberObject.create({
- avatar_template: "avatar",
- system_avatar_template: "system",
- gravatar_avatar_template: "gravatar",
-
- system_avatar_upload_id: 1,
- gravatar_avatar_upload_id: 2,
- custom_avatar_upload_id: 3,
});
- avatarSelectorController.setProperties({ user });
+ test("avatarTemplate", function (assert) {
+ const avatarSelectorController = this.owner.lookup(
+ "controller:avatar-selector"
+ );
- user.set("avatar_template", "system");
- assert.equal(
- avatarSelectorController.get("selectedUploadId"),
- 1,
- "we are using system by default"
- );
+ const user = EmberObject.create({
+ avatar_template: "avatar",
+ system_avatar_template: "system",
+ gravatar_avatar_template: "gravatar",
- user.set("avatar_template", "gravatar");
- assert.equal(
- avatarSelectorController.get("selectedUploadId"),
- 2,
- "we are using gravatar when set"
- );
+ system_avatar_upload_id: 1,
+ gravatar_avatar_upload_id: 2,
+ custom_avatar_upload_id: 3,
+ });
- user.set("avatar_template", "avatar");
- assert.equal(
- avatarSelectorController.get("selectedUploadId"),
- 3,
- "we are using custom when set"
- );
+ avatarSelectorController.setProperties({ user });
+
+ user.set("avatar_template", "system");
+ assert.equal(
+ avatarSelectorController.get("selectedUploadId"),
+ 1,
+ "we are using system by default"
+ );
+
+ user.set("avatar_template", "gravatar");
+ assert.equal(
+ avatarSelectorController.get("selectedUploadId"),
+ 2,
+ "we are using gravatar when set"
+ );
+
+ user.set("avatar_template", "avatar");
+ assert.equal(
+ avatarSelectorController.get("selectedUploadId"),
+ 3,
+ "we are using custom when set"
+ );
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js
index 189bceb657..a713681aa4 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/bookmark-test.js
@@ -1,5 +1,5 @@
import sinon from "sinon";
-import { moduleFor } from "ember-qunit";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
import { test } from "qunit";
import { logIn } from "discourse/tests/helpers/qunit-helpers";
import User from "discourse/models/user";
@@ -9,247 +9,252 @@ import { fakeTime } from "discourse/tests/helpers/qunit-helpers";
let BookmarkController;
-moduleFor("controller:bookmark", {
- beforeEach() {
- logIn();
- KeyboardShortcutInitializer.initialize(this.container);
- BookmarkController = this.subject({
- currentUser: User.current(),
- site: { isMobileDevice: false },
- });
- BookmarkController.onShow();
- },
-
- afterEach() {
- sinon.restore();
- },
-});
-
function mockMomentTz(dateString) {
fakeTime(dateString, BookmarkController.userTimezone);
}
-test("showLaterToday when later today is tomorrow do not show", function (assert) {
- mockMomentTz("2019-12-11T22:00:00");
+discourseModule("Unit | Controller | bookmark", function (hooks) {
+ hooks.beforeEach(function () {
+ logIn();
+ KeyboardShortcutInitializer.initialize(this.container);
- assert.equal(BookmarkController.get("showLaterToday"), false);
-});
+ BookmarkController = this.owner.lookup("controller:bookmark");
+ BookmarkController.setProperties({
+ currentUser: User.current(),
+ site: { isMobileDevice: false },
+ });
+ BookmarkController.onShow();
+ });
-test("showLaterToday when later today is after 5pm but before 6pm", function (assert) {
- mockMomentTz("2019-12-11T15:00:00");
- assert.equal(BookmarkController.get("showLaterToday"), true);
-});
+ hooks.afterEach(function () {
+ sinon.restore();
+ });
-test("showLaterToday when now is after the cutoff time (5pm)", function (assert) {
- mockMomentTz("2019-12-11T17:00:00");
- assert.equal(BookmarkController.get("showLaterToday"), false);
-});
+ test("showLaterToday when later today is tomorrow do not show", function (assert) {
+ mockMomentTz("2019-12-11T22:00:00");
-test("showLaterToday when later today is before the end of the day, show", function (assert) {
- mockMomentTz("2019-12-11T10:00:00");
+ assert.equal(BookmarkController.get("showLaterToday"), false);
+ });
- assert.equal(BookmarkController.get("showLaterToday"), true);
-});
+ test("showLaterToday when later today is after 5pm but before 6pm", function (assert) {
+ mockMomentTz("2019-12-11T15:00:00");
+ assert.equal(BookmarkController.get("showLaterToday"), true);
+ });
-test("nextWeek gets next week correctly", function (assert) {
- mockMomentTz("2019-12-11T08:00:00");
+ test("showLaterToday when now is after the cutoff time (5pm)", function (assert) {
+ mockMomentTz("2019-12-11T17:00:00");
+ assert.equal(BookmarkController.get("showLaterToday"), false);
+ });
- assert.equal(
- BookmarkController.nextWeek().format("YYYY-MM-DD"),
- "2019-12-18"
- );
-});
+ test("showLaterToday when later today is before the end of the day, show", function (assert) {
+ mockMomentTz("2019-12-11T10:00:00");
-test("nextMonth gets next month correctly", function (assert) {
- mockMomentTz("2019-12-11T08:00:00");
+ assert.equal(BookmarkController.get("showLaterToday"), true);
+ });
- assert.equal(
- BookmarkController.nextMonth().format("YYYY-MM-DD"),
- "2020-01-11"
- );
-});
+ test("nextWeek gets next week correctly", function (assert) {
+ mockMomentTz("2019-12-11T08:00:00");
-test("laterThisWeek gets 2 days from now", function (assert) {
- mockMomentTz("2019-12-10T08:00:00");
+ assert.equal(
+ BookmarkController.nextWeek().format("YYYY-MM-DD"),
+ "2019-12-18"
+ );
+ });
- assert.equal(
- BookmarkController.laterThisWeek().format("YYYY-MM-DD"),
- "2019-12-12"
- );
-});
+ test("nextMonth gets next month correctly", function (assert) {
+ mockMomentTz("2019-12-11T08:00:00");
-test("laterThisWeek returns null if we are at Thursday already", function (assert) {
- mockMomentTz("2019-12-12T08:00:00");
+ assert.equal(
+ BookmarkController.nextMonth().format("YYYY-MM-DD"),
+ "2020-01-11"
+ );
+ });
- assert.equal(BookmarkController.laterThisWeek(), null);
-});
+ test("laterThisWeek gets 2 days from now", function (assert) {
+ mockMomentTz("2019-12-10T08:00:00");
-test("showLaterThisWeek returns true if < Thursday", function (assert) {
- mockMomentTz("2019-12-10T08:00:00");
+ assert.equal(
+ BookmarkController.laterThisWeek().format("YYYY-MM-DD"),
+ "2019-12-12"
+ );
+ });
- assert.equal(BookmarkController.showLaterThisWeek, true);
-});
+ test("laterThisWeek returns null if we are at Thursday already", function (assert) {
+ mockMomentTz("2019-12-12T08:00:00");
-test("showLaterThisWeek returns false if > Thursday", function (assert) {
- mockMomentTz("2019-12-12T08:00:00");
+ assert.equal(BookmarkController.laterThisWeek(), null);
+ });
- assert.equal(BookmarkController.showLaterThisWeek, false);
-});
-test("tomorrow gets tomorrow correctly", function (assert) {
- mockMomentTz("2019-12-11T08:00:00");
+ test("showLaterThisWeek returns true if < Thursday", function (assert) {
+ mockMomentTz("2019-12-10T08:00:00");
- assert.equal(
- BookmarkController.tomorrow().format("YYYY-MM-DD"),
- "2019-12-12"
- );
-});
+ assert.equal(BookmarkController.showLaterThisWeek, true);
+ });
-test("startOfDay changes the time of the provided date to 8:00am correctly", function (assert) {
- let dt = moment.tz(
- "2019-12-11T11:37:16",
- BookmarkController.currentUser.resolvedTimezone(
- BookmarkController.currentUser
- )
- );
+ test("showLaterThisWeek returns false if > Thursday", function (assert) {
+ mockMomentTz("2019-12-12T08:00:00");
- assert.equal(
- BookmarkController.startOfDay(dt).format("YYYY-MM-DD HH:mm:ss"),
- "2019-12-11 08:00:00"
- );
-});
+ assert.equal(BookmarkController.showLaterThisWeek, false);
+ });
+ test("tomorrow gets tomorrow correctly", function (assert) {
+ mockMomentTz("2019-12-11T08:00:00");
-test("laterToday gets 3 hours from now and if before half-past, it rounds down", function (assert) {
- mockMomentTz("2019-12-11T08:13:00");
+ assert.equal(
+ BookmarkController.tomorrow().format("YYYY-MM-DD"),
+ "2019-12-12"
+ );
+ });
- assert.equal(
- BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
- "2019-12-11 11:00:00"
- );
-});
-
-test("laterToday gets 3 hours from now and if after half-past, it rounds up to the next hour", function (assert) {
- mockMomentTz("2019-12-11T08:43:00");
-
- assert.equal(
- BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
- "2019-12-11 12:00:00"
- );
-});
-
-test("laterToday is capped to 6pm. later today at 3pm = 6pm, 3:30pm = 6pm, 4pm = 6pm, 4:59pm = 6pm", function (assert) {
- mockMomentTz("2019-12-11T15:00:00");
-
- assert.equal(
- BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
- "2019-12-11 18:00:00",
- "3pm should max to 6pm"
- );
-
- mockMomentTz("2019-12-11T15:31:00");
-
- assert.equal(
- BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
- "2019-12-11 18:00:00",
- "3:30pm should max to 6pm"
- );
-
- mockMomentTz("2019-12-11T16:00:00");
-
- assert.equal(
- BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
- "2019-12-11 18:00:00",
- "4pm should max to 6pm"
- );
-
- mockMomentTz("2019-12-11T16:59:00");
-
- assert.equal(
- BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
- "2019-12-11 18:00:00",
- "4:59pm should max to 6pm"
- );
-});
-
-test("showLaterToday returns false if >= 5PM", function (assert) {
- mockMomentTz("2019-12-11T17:00:01");
- assert.equal(BookmarkController.showLaterToday, false);
-});
-
-test("showLaterToday returns false if >= 5PM", function (assert) {
- mockMomentTz("2019-12-11T17:00:01");
- assert.equal(BookmarkController.showLaterToday, false);
-});
-
-test("reminderAt - custom - defaults to 8:00am if the time is not selected", function (assert) {
- BookmarkController.customReminderDate = "2028-12-12";
- BookmarkController.selectedReminderType =
- BookmarkController.reminderTypes.CUSTOM;
- const reminderAt = BookmarkController._reminderAt();
- assert.equal(BookmarkController.customReminderTime, "08:00");
- assert.equal(
- reminderAt.toString(),
- moment
- .tz(
- "2028-12-12 08:00",
- BookmarkController.currentUser.resolvedTimezone(
- BookmarkController.currentUser
- )
+ test("startOfDay changes the time of the provided date to 8:00am correctly", function (assert) {
+ let dt = moment.tz(
+ "2019-12-11T11:37:16",
+ BookmarkController.currentUser.resolvedTimezone(
+ BookmarkController.currentUser
)
- .toString(),
- "the custom date and time are parsed correctly with default time"
- );
-});
-
-test("loadLastUsedCustomReminderDatetime fills the custom reminder date + time if present in localStorage", function (assert) {
- mockMomentTz("2019-12-11T08:00:00");
- localStorage.lastCustomBookmarkReminderDate = "2019-12-12";
- localStorage.lastCustomBookmarkReminderTime = "08:00";
-
- BookmarkController._loadLastUsedCustomReminderDatetime();
-
- assert.equal(BookmarkController.lastCustomReminderDate, "2019-12-12");
- assert.equal(BookmarkController.lastCustomReminderTime, "08:00");
-});
-
-test("loadLastUsedCustomReminderDatetime does not fills the custom reminder date + time if the datetime in localStorage is < now", function (assert) {
- mockMomentTz("2019-12-11T08:00:00");
- localStorage.lastCustomBookmarkReminderDate = "2019-12-11";
- localStorage.lastCustomBookmarkReminderTime = "07:00";
-
- BookmarkController._loadLastUsedCustomReminderDatetime();
-
- assert.equal(BookmarkController.lastCustomReminderDate, null);
- assert.equal(BookmarkController.lastCustomReminderTime, null);
-});
-
-test("user timezone updates when the modal is shown", function (assert) {
- User.current().changeTimezone(null);
- let stub = sinon.stub(moment.tz, "guess").returns("Europe/Moscow");
- BookmarkController.onShow();
- assert.equal(BookmarkController.userHasTimezoneSet, true);
- assert.equal(
- BookmarkController.userTimezone,
- "Europe/Moscow",
- "the user does not have their timezone set and a timezone is guessed"
- );
- User.current().changeTimezone("Australia/Brisbane");
- BookmarkController.onShow();
- assert.equal(BookmarkController.userHasTimezoneSet, true);
- assert.equal(
- BookmarkController.userTimezone,
- "Australia/Brisbane",
- "the user does their timezone set"
- );
- stub.restore();
-});
-
-test("opening the modal with an existing bookmark with reminder at prefills the custom reminder type", function (assert) {
- let name = "test";
- let reminderAt = "2020-05-15T09:45:00";
- BookmarkController.model = { id: 1, name: name, reminderAt: reminderAt };
- BookmarkController.onShow();
- assert.equal(BookmarkController.selectedReminderType, REMINDER_TYPES.CUSTOM);
- assert.equal(BookmarkController.customReminderDate, "2020-05-15");
- assert.equal(BookmarkController.customReminderTime, "09:45");
- assert.equal(BookmarkController.model.name, name);
+ );
+
+ assert.equal(
+ BookmarkController.startOfDay(dt).format("YYYY-MM-DD HH:mm:ss"),
+ "2019-12-11 08:00:00"
+ );
+ });
+
+ test("laterToday gets 3 hours from now and if before half-past, it rounds down", function (assert) {
+ mockMomentTz("2019-12-11T08:13:00");
+
+ assert.equal(
+ BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+ "2019-12-11 11:00:00"
+ );
+ });
+
+ test("laterToday gets 3 hours from now and if after half-past, it rounds up to the next hour", function (assert) {
+ mockMomentTz("2019-12-11T08:43:00");
+
+ assert.equal(
+ BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+ "2019-12-11 12:00:00"
+ );
+ });
+
+ test("laterToday is capped to 6pm. later today at 3pm = 6pm, 3:30pm = 6pm, 4pm = 6pm, 4:59pm = 6pm", function (assert) {
+ mockMomentTz("2019-12-11T15:00:00");
+
+ assert.equal(
+ BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+ "2019-12-11 18:00:00",
+ "3pm should max to 6pm"
+ );
+
+ mockMomentTz("2019-12-11T15:31:00");
+
+ assert.equal(
+ BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+ "2019-12-11 18:00:00",
+ "3:30pm should max to 6pm"
+ );
+
+ mockMomentTz("2019-12-11T16:00:00");
+
+ assert.equal(
+ BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+ "2019-12-11 18:00:00",
+ "4pm should max to 6pm"
+ );
+
+ mockMomentTz("2019-12-11T16:59:00");
+
+ assert.equal(
+ BookmarkController.laterToday().format("YYYY-MM-DD HH:mm:ss"),
+ "2019-12-11 18:00:00",
+ "4:59pm should max to 6pm"
+ );
+ });
+
+ test("showLaterToday returns false if >= 5PM", function (assert) {
+ mockMomentTz("2019-12-11T17:00:01");
+ assert.equal(BookmarkController.showLaterToday, false);
+ });
+
+ test("showLaterToday returns false if >= 5PM", function (assert) {
+ mockMomentTz("2019-12-11T17:00:01");
+ assert.equal(BookmarkController.showLaterToday, false);
+ });
+
+ test("reminderAt - custom - defaults to 8:00am if the time is not selected", function (assert) {
+ BookmarkController.customReminderDate = "2028-12-12";
+ BookmarkController.selectedReminderType =
+ BookmarkController.reminderTypes.CUSTOM;
+ const reminderAt = BookmarkController._reminderAt();
+ assert.equal(BookmarkController.customReminderTime, "08:00");
+ assert.equal(
+ reminderAt.toString(),
+ moment
+ .tz(
+ "2028-12-12 08:00",
+ BookmarkController.currentUser.resolvedTimezone(
+ BookmarkController.currentUser
+ )
+ )
+ .toString(),
+ "the custom date and time are parsed correctly with default time"
+ );
+ });
+
+ test("loadLastUsedCustomReminderDatetime fills the custom reminder date + time if present in localStorage", function (assert) {
+ mockMomentTz("2019-12-11T08:00:00");
+ localStorage.lastCustomBookmarkReminderDate = "2019-12-12";
+ localStorage.lastCustomBookmarkReminderTime = "08:00";
+
+ BookmarkController._loadLastUsedCustomReminderDatetime();
+
+ assert.equal(BookmarkController.lastCustomReminderDate, "2019-12-12");
+ assert.equal(BookmarkController.lastCustomReminderTime, "08:00");
+ });
+
+ test("loadLastUsedCustomReminderDatetime does not fills the custom reminder date + time if the datetime in localStorage is < now", function (assert) {
+ mockMomentTz("2019-12-11T08:00:00");
+ localStorage.lastCustomBookmarkReminderDate = "2019-12-11";
+ localStorage.lastCustomBookmarkReminderTime = "07:00";
+
+ BookmarkController._loadLastUsedCustomReminderDatetime();
+
+ assert.equal(BookmarkController.lastCustomReminderDate, null);
+ assert.equal(BookmarkController.lastCustomReminderTime, null);
+ });
+
+ test("user timezone updates when the modal is shown", function (assert) {
+ User.current().changeTimezone(null);
+ let stub = sinon.stub(moment.tz, "guess").returns("Europe/Moscow");
+ BookmarkController.onShow();
+ assert.equal(BookmarkController.userHasTimezoneSet, true);
+ assert.equal(
+ BookmarkController.userTimezone,
+ "Europe/Moscow",
+ "the user does not have their timezone set and a timezone is guessed"
+ );
+ User.current().changeTimezone("Australia/Brisbane");
+ BookmarkController.onShow();
+ assert.equal(BookmarkController.userHasTimezoneSet, true);
+ assert.equal(
+ BookmarkController.userTimezone,
+ "Australia/Brisbane",
+ "the user does their timezone set"
+ );
+ stub.restore();
+ });
+
+ test("opening the modal with an existing bookmark with reminder at prefills the custom reminder type", function (assert) {
+ let name = "test";
+ let reminderAt = "2020-05-15T09:45:00";
+ BookmarkController.model = { id: 1, name: name, reminderAt: reminderAt };
+ BookmarkController.onShow();
+ assert.equal(
+ BookmarkController.selectedReminderType,
+ REMINDER_TYPES.CUSTOM
+ );
+ assert.equal(BookmarkController.customReminderDate, "2020-05-15");
+ assert.equal(BookmarkController.customReminderTime, "09:45");
+ assert.equal(BookmarkController.model.name, name);
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
index 45f66b4e63..6f0e157434 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
@@ -1,104 +1,107 @@
import { test } from "qunit";
import I18n from "I18n";
-import { controllerModule } from "discourse/tests/helpers/qunit-helpers";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
-controllerModule("controller:create-account", {
- needs: ["controller:modal", "controller:login"],
-});
+discourseModule("Unit | Controller | create-account", function () {
+ test("basicUsernameValidation", async function (assert) {
+ const testInvalidUsername = async function (username, expectedReason) {
+ const controller = await this.owner.lookup("controller:create-account");
+ controller.set("accountUsername", username);
-test("basicUsernameValidation", async function (assert) {
- const subject = this.subject;
+ assert.equal(
+ controller.get("basicUsernameValidation.failed"),
+ true,
+ "username should be invalid: " + username
+ );
+ assert.equal(
+ controller.get("basicUsernameValidation.reason"),
+ expectedReason,
+ "username validation reason: " + username + ", " + expectedReason
+ );
+ }.bind(this);
- const testInvalidUsername = async (username, expectedReason) => {
- const controller = await subject();
- controller.set("accountUsername", username);
+ testInvalidUsername("", undefined);
+ testInvalidUsername("x", I18n.t("user.username.too_short"));
+ testInvalidUsername(
+ "123456789012345678901",
+ I18n.t("user.username.too_long")
+ );
+
+ const controller = await this.owner.lookup("controller:create-account");
+ controller.setProperties({
+ accountUsername: "porkchops",
+ prefilledUsername: "porkchops",
+ });
assert.equal(
- controller.get("basicUsernameValidation.failed"),
+ controller.get("basicUsernameValidation.ok"),
true,
- "username should be invalid: " + username
+ "Prefilled username is valid"
);
assert.equal(
controller.get("basicUsernameValidation.reason"),
- expectedReason,
- "username validation reason: " + username + ", " + expectedReason
+ I18n.t("user.username.prefilled"),
+ "Prefilled username is valid"
);
- };
-
- testInvalidUsername("", undefined);
- testInvalidUsername("x", I18n.t("user.username.too_short"));
- testInvalidUsername(
- "123456789012345678901",
- I18n.t("user.username.too_long")
- );
-
- const controller = await subject();
- controller.setProperties({
- accountUsername: "porkchops",
- prefilledUsername: "porkchops",
});
- assert.equal(
- controller.get("basicUsernameValidation.ok"),
- true,
- "Prefilled username is valid"
- );
- assert.equal(
- controller.get("basicUsernameValidation.reason"),
- I18n.t("user.username.prefilled"),
- "Prefilled username is valid"
- );
-});
+ test("passwordValidation", async function (assert) {
+ const controller = await this.owner.lookup("controller:create-account");
-test("passwordValidation", async function (assert) {
- const controller = await this.subject();
-
- controller.set("authProvider", "");
- controller.set("accountEmail", "pork@chops.com");
- controller.set("accountUsername", "porkchops");
- controller.set("prefilledUsername", "porkchops");
- controller.set("accountPassword", "b4fcdae11f9167");
-
- assert.equal(controller.get("passwordValidation.ok"), true, "Password is ok");
- assert.equal(
- controller.get("passwordValidation.reason"),
- I18n.t("user.password.ok"),
- "Password is valid"
- );
-
- const testInvalidPassword = (password, expectedReason) => {
- controller.set("accountPassword", password);
+ controller.set("authProvider", "");
+ controller.set("accountEmail", "pork@chops.com");
+ controller.set("accountUsername", "porkchops");
+ controller.set("prefilledUsername", "porkchops");
+ controller.set("accountPassword", "b4fcdae11f9167");
assert.equal(
- controller.get("passwordValidation.failed"),
+ controller.get("passwordValidation.ok"),
true,
- "password should be invalid: " + password
+ "Password is ok"
);
assert.equal(
controller.get("passwordValidation.reason"),
- expectedReason,
- "password validation reason: " + password + ", " + expectedReason
+ I18n.t("user.password.ok"),
+ "Password is valid"
);
- };
- testInvalidPassword("", undefined);
- testInvalidPassword("x", I18n.t("user.password.too_short"));
- testInvalidPassword("porkchops", I18n.t("user.password.same_as_username"));
- testInvalidPassword("pork@chops.com", I18n.t("user.password.same_as_email"));
-});
-
-test("authProviderDisplayName", async function (assert) {
- const controller = this.subject();
-
- assert.equal(
- controller.authProviderDisplayName("facebook"),
- I18n.t("login.facebook.name"),
- "provider name is translated correctly"
- );
-
- assert.equal(
- controller.authProviderDisplayName("idontexist"),
- "idontexist",
- "provider name falls back if not found"
- );
+ const testInvalidPassword = (password, expectedReason) => {
+ controller.set("accountPassword", password);
+
+ assert.equal(
+ controller.get("passwordValidation.failed"),
+ true,
+ "password should be invalid: " + password
+ );
+ assert.equal(
+ controller.get("passwordValidation.reason"),
+ expectedReason,
+ "password validation reason: " + password + ", " + expectedReason
+ );
+ };
+
+ testInvalidPassword("", undefined);
+ testInvalidPassword("x", I18n.t("user.password.too_short"));
+ testInvalidPassword("porkchops", I18n.t("user.password.same_as_username"));
+ testInvalidPassword(
+ "pork@chops.com",
+ I18n.t("user.password.same_as_email")
+ );
+ });
+
+ test("authProviderDisplayName", async function (assert) {
+ const controller = this.owner.lookup("controller:create-account");
+
+ assert.equal(
+ controller.authProviderDisplayName("facebook"),
+ I18n.t("login.facebook.name"),
+ "provider name is translated correctly"
+ );
+
+ assert.equal(
+ controller.authProviderDisplayName("idontexist"),
+ "idontexist",
+ "provider name falls back if not found"
+ );
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
index 5a04d41433..df1cbc1dcd 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/history-test.js
@@ -1,117 +1,118 @@
-import { moduleFor } from "ember-qunit";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
import { test } from "qunit";
-moduleFor("controller:history");
-test("displayEdit", async function (assert) {
- const HistoryController = this.subject();
+discourseModule("Unit | Controller | history", function () {
+ test("displayEdit", async function (assert) {
+ const HistoryController = this.owner.lookup("controller:history");
- HistoryController.setProperties({
- model: { last_revision: 3, current_revision: 3, can_edit: false },
- topicController: {},
- });
+ HistoryController.setProperties({
+ model: { last_revision: 3, current_revision: 3, can_edit: false },
+ topicController: {},
+ });
- assert.equal(
- HistoryController.get("displayEdit"),
- false,
- "it should not display edit button when user cannot edit the post"
- );
+ assert.equal(
+ HistoryController.get("displayEdit"),
+ false,
+ "it should not display edit button when user cannot edit the post"
+ );
- HistoryController.set("model.can_edit", true);
+ HistoryController.set("model.can_edit", true);
- assert.equal(
- HistoryController.get("displayEdit"),
- true,
- "it should display edit button when user can edit the post"
- );
+ assert.equal(
+ HistoryController.get("displayEdit"),
+ true,
+ "it should display edit button when user can edit the post"
+ );
- HistoryController.set("topicController", null);
- assert.equal(
- HistoryController.get("displayEdit"),
- false,
- "it should not display edit button when there is not topic controller"
- );
- HistoryController.set("topicController", {});
+ HistoryController.set("topicController", null);
+ assert.equal(
+ HistoryController.get("displayEdit"),
+ false,
+ "it should not display edit button when there is not topic controller"
+ );
+ HistoryController.set("topicController", {});
- HistoryController.set("model.current_revision", 2);
- assert.equal(
- HistoryController.get("displayEdit"),
- false,
- "it should only display the edit button on the latest revision"
- );
+ HistoryController.set("model.current_revision", 2);
+ assert.equal(
+ HistoryController.get("displayEdit"),
+ false,
+ "it should only display the edit button on the latest revision"
+ );
- const html = `
-
-
-
-
-
-
-
-
-
-
-
- Column
- Test
-
-
-
-
- Osama
- Testing
-
-
-
`;
+ const html = `
+
+
+
+
+
+
+
+
+
+
+
+ Column
+ Test
+
+
+
+
+ Osama
+ Testing
+
+
+
`;
- const expectedOutput = `
-
-
-
-
-
-
-
-
-
-
-
- Column
- Test
-
-
-
-
- Osama
- Testing
-
-
-
`;
+ const expectedOutput = `
+
+
+
+
+
+
+
+
+
+
+
+ Column
+ Test
+
+
+
+
+ Osama
+ Testing
+
+
+
`;
- HistoryController.setProperties({
- viewMode: "side_by_side",
- model: {
- body_changes: {
- side_by_side: html,
+ HistoryController.setProperties({
+ viewMode: "side_by_side",
+ model: {
+ body_changes: {
+ side_by_side: html,
+ },
},
- },
+ });
+
+ await HistoryController.bodyDiffChanged();
+
+ const output = HistoryController.get("bodyDiff");
+ assert.equal(
+ output,
+ expectedOutput,
+ "it keeps HTML safe and doesn't strip onebox tags"
+ );
});
-
- await HistoryController.bodyDiffChanged();
-
- const output = HistoryController.get("bodyDiff");
- assert.equal(
- output,
- expectedOutput,
- "it keeps HTML safe and doesn't strip onebox tags"
- );
});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js
index ce0b1016cd..35b6fd228b 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-account-test.js
@@ -1,34 +1,36 @@
-import { moduleFor } from "ember-qunit";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
import { test } from "qunit";
import EmberObject from "@ember/object";
-moduleFor("controller:preferences/account");
-test("updating of associated accounts", function (assert) {
- const controller = this.subject({
- siteSettings: {
- enable_google_oauth2_logins: true,
- },
- model: EmberObject.create({
- id: 70,
- second_factor_enabled: true,
- is_anonymous: true,
- }),
- currentUser: EmberObject.create({
- id: 1234,
- }),
- site: EmberObject.create({
- isMobileDevice: false,
- }),
+discourseModule("Unit | Controller | preferences/account", function () {
+ test("updating of associated accounts", function (assert) {
+ const controller = this.owner.lookup("controller:preferences/account");
+ controller.setProperties({
+ siteSettings: {
+ enable_google_oauth2_logins: true,
+ },
+ model: EmberObject.create({
+ id: 70,
+ second_factor_enabled: true,
+ is_anonymous: true,
+ }),
+ currentUser: EmberObject.create({
+ id: 1234,
+ }),
+ site: EmberObject.create({
+ isMobileDevice: false,
+ }),
+ });
+
+ assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
+
+ controller.set("model.second_factor_enabled", false);
+ assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
+
+ controller.set("model.is_anonymous", false);
+ assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
+
+ controller.set("model.id", 1234);
+ assert.equal(controller.get("canUpdateAssociatedAccounts"), true);
});
-
- assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
-
- controller.set("model.second_factor_enabled", false);
- assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
-
- controller.set("model.is_anonymous", false);
- assert.equal(controller.get("canUpdateAssociatedAccounts"), false);
-
- controller.set("model.id", 1234);
- assert.equal(controller.get("canUpdateAssociatedAccounts"), true);
});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js
index 53e249d3ac..21df63e26f 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/preferences-second-factor-test.js
@@ -1,13 +1,17 @@
-import { moduleFor } from "ember-qunit";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
import { test } from "qunit";
-moduleFor("controller:preferences/second-factor");
-test("displayOAuthWarning when OAuth login methods are enabled", function (assert) {
- const controller = this.subject({
- siteSettings: {
- enable_google_oauth2_logins: true,
- },
+discourseModule("Unit | Controller | preferences/second-factor", function () {
+ test("displayOAuthWarning when OAuth login methods are enabled", function (assert) {
+ const controller = this.owner.lookup(
+ "controller:preferences/second-factor"
+ );
+ controller.setProperties({
+ siteSettings: {
+ enable_google_oauth2_logins: true,
+ },
+ });
+
+ assert.equal(controller.get("displayOAuthWarning"), true);
});
-
- assert.equal(controller.get("displayOAuthWarning"), true);
});
diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js
index 2c3eaa32cc..47c4323d70 100644
--- a/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/controllers/reorder-categories-test.js
@@ -1,205 +1,211 @@
-import { moduleFor } from "ember-qunit";
+import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
import { test } from "qunit";
import EmberObject from "@ember/object";
-import { mapRoutes } from "discourse/mapping-router";
import createStore from "discourse/tests/helpers/create-store";
-moduleFor("controller:reorder-categories", "controller:reorder-categories", {
- beforeEach() {
- this.registry.register("router:main", mapRoutes());
- },
- needs: ["controller:modal"],
-});
+discourseModule("Unit | Controller | reorder-categories", function () {
+ test("reorder set unique position number", function (assert) {
+ const store = createStore();
-test("reorder set unique position number", function (assert) {
- const store = createStore();
+ const categories = [];
+ for (let i = 0; i < 3; ++i) {
+ categories.push(store.createRecord("category", { id: i, position: 0 }));
+ }
- const categories = [];
- for (let i = 0; i < 3; ++i) {
- categories.push(store.createRecord("category", { id: i, position: 0 }));
- }
+ const site = EmberObject.create({ categories: categories });
+ const reorderCategoriesController = this.owner.lookup(
+ "controller:reorder-categories"
+ );
+ reorderCategoriesController.setProperties({ site });
+ reorderCategoriesController.reorder();
- const site = EmberObject.create({ categories: categories });
- const reorderCategoriesController = this.subject({ site });
+ reorderCategoriesController
+ .get("categoriesOrdered")
+ .forEach((category, index) => {
+ assert.equal(category.get("position"), index);
+ });
+ });
- reorderCategoriesController.reorder();
+ test("reorder places subcategories after their parent categories, while maintaining the relative order", function (assert) {
+ const store = createStore();
- reorderCategoriesController
- .get("categoriesOrdered")
- .forEach((category, index) => {
- assert.equal(category.get("position"), index);
+ const parent = store.createRecord("category", {
+ id: 1,
+ position: 1,
+ slug: "parent",
});
-});
-
-test("reorder places subcategories after their parent categories, while maintaining the relative order", function (assert) {
- const store = createStore();
-
- const parent = store.createRecord("category", {
- id: 1,
- position: 1,
- slug: "parent",
- });
- const child1 = store.createRecord("category", {
- id: 2,
- position: 3,
- slug: "child1",
- parent_category_id: 1,
- });
- const child2 = store.createRecord("category", {
- id: 3,
- position: 0,
- slug: "child2",
- parent_category_id: 1,
- });
- const other = store.createRecord("category", {
- id: 4,
- position: 2,
- slug: "other",
- });
-
- const categories = [child2, parent, other, child1];
- const expectedOrderSlugs = ["parent", "child2", "child1", "other"];
-
- const site = EmberObject.create({ categories: categories });
- const reorderCategoriesController = this.subject({ site });
-
- reorderCategoriesController.reorder();
-
- assert.deepEqual(
- reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
- expectedOrderSlugs
- );
-});
-
-test("changing the position number of a category should place it at given position", function (assert) {
- const store = createStore();
-
- const elem1 = store.createRecord("category", {
- id: 1,
- position: 0,
- slug: "foo",
- });
-
- const elem2 = store.createRecord("category", {
- id: 2,
- position: 1,
- slug: "bar",
- });
-
- const elem3 = store.createRecord("category", {
- id: 3,
- position: 2,
- slug: "test",
- });
-
- const categories = [elem1, elem2, elem3];
- const site = EmberObject.create({ categories: categories });
- const reorderCategoriesController = this.subject({ site });
-
- reorderCategoriesController.actions.change.call(
- reorderCategoriesController,
- elem1,
- { target: { value: "2" } }
- );
-
- assert.deepEqual(
- reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
- ["test", "bar", "foo"]
- );
-});
-
-test("changing the position number of a category should place it at given position and respect children", function (assert) {
- const store = createStore();
-
- const elem1 = store.createRecord("category", {
- id: 1,
- position: 0,
- slug: "foo",
- });
-
- const child1 = store.createRecord("category", {
- id: 4,
- position: 1,
- slug: "foochild",
- parent_category_id: 1,
- });
-
- const elem2 = store.createRecord("category", {
- id: 2,
- position: 2,
- slug: "bar",
- });
-
- const elem3 = store.createRecord("category", {
- id: 3,
- position: 3,
- slug: "test",
- });
-
- const categories = [elem1, child1, elem2, elem3];
- const site = EmberObject.create({ categories: categories });
- const reorderCategoriesController = this.subject({ site });
-
- reorderCategoriesController.actions.change.call(
- reorderCategoriesController,
- elem1,
- { target: { value: 3 } }
- );
-
- assert.deepEqual(
- reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
- ["test", "bar", "foo", "foochild"]
- );
-});
-
-test("changing the position through click on arrow of a category should place it at given position and respect children", function (assert) {
- const store = createStore();
-
- const elem1 = store.createRecord("category", {
- id: 1,
- position: 0,
- slug: "foo",
- });
-
- const child1 = store.createRecord("category", {
- id: 4,
- position: 1,
- slug: "foochild",
- parent_category_id: 1,
- });
-
- const child2 = store.createRecord("category", {
- id: 5,
- position: 2,
- slug: "foochildchild",
- parent_category_id: 4,
- });
-
- const elem2 = store.createRecord("category", {
- id: 2,
- position: 3,
- slug: "bar",
- });
-
- const elem3 = store.createRecord("category", {
- id: 3,
- position: 4,
- slug: "test",
- });
-
- const categories = [elem1, child1, child2, elem2, elem3];
- const site = EmberObject.create({ categories: categories });
- const reorderCategoriesController = this.subject({ site });
-
- reorderCategoriesController.reorder();
-
- reorderCategoriesController.actions.moveDown.call(
- reorderCategoriesController,
- elem1
- );
-
- assert.deepEqual(
- reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
- ["bar", "foo", "foochild", "foochildchild", "test"]
- );
+ const child1 = store.createRecord("category", {
+ id: 2,
+ position: 3,
+ slug: "child1",
+ parent_category_id: 1,
+ });
+ const child2 = store.createRecord("category", {
+ id: 3,
+ position: 0,
+ slug: "child2",
+ parent_category_id: 1,
+ });
+ const other = store.createRecord("category", {
+ id: 4,
+ position: 2,
+ slug: "other",
+ });
+
+ const categories = [child2, parent, other, child1];
+ const expectedOrderSlugs = ["parent", "child2", "child1", "other"];
+
+ const site = EmberObject.create({ categories: categories });
+ const reorderCategoriesController = this.owner.lookup(
+ "controller:reorder-categories"
+ );
+ reorderCategoriesController.setProperties({ site });
+ reorderCategoriesController.reorder();
+
+ assert.deepEqual(
+ reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
+ expectedOrderSlugs
+ );
+ });
+
+ test("changing the position number of a category should place it at given position", function (assert) {
+ const store = createStore();
+
+ const elem1 = store.createRecord("category", {
+ id: 1,
+ position: 0,
+ slug: "foo",
+ });
+
+ const elem2 = store.createRecord("category", {
+ id: 2,
+ position: 1,
+ slug: "bar",
+ });
+
+ const elem3 = store.createRecord("category", {
+ id: 3,
+ position: 2,
+ slug: "test",
+ });
+
+ const categories = [elem1, elem2, elem3];
+ const site = EmberObject.create({ categories: categories });
+ const reorderCategoriesController = this.owner.lookup(
+ "controller:reorder-categories"
+ );
+ reorderCategoriesController.setProperties({ site });
+
+ reorderCategoriesController.actions.change.call(
+ reorderCategoriesController,
+ elem1,
+ { target: { value: "2" } }
+ );
+
+ assert.deepEqual(
+ reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
+ ["test", "bar", "foo"]
+ );
+ });
+
+ test("changing the position number of a category should place it at given position and respect children", function (assert) {
+ const store = createStore();
+
+ const elem1 = store.createRecord("category", {
+ id: 1,
+ position: 0,
+ slug: "foo",
+ });
+
+ const child1 = store.createRecord("category", {
+ id: 4,
+ position: 1,
+ slug: "foochild",
+ parent_category_id: 1,
+ });
+
+ const elem2 = store.createRecord("category", {
+ id: 2,
+ position: 2,
+ slug: "bar",
+ });
+
+ const elem3 = store.createRecord("category", {
+ id: 3,
+ position: 3,
+ slug: "test",
+ });
+
+ const categories = [elem1, child1, elem2, elem3];
+ const site = EmberObject.create({ categories: categories });
+ const reorderCategoriesController = this.owner.lookup(
+ "controller:reorder-categories"
+ );
+ reorderCategoriesController.setProperties({ site });
+
+ reorderCategoriesController.actions.change.call(
+ reorderCategoriesController,
+ elem1,
+ { target: { value: 3 } }
+ );
+
+ assert.deepEqual(
+ reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
+ ["test", "bar", "foo", "foochild"]
+ );
+ });
+
+ test("changing the position through click on arrow of a category should place it at given position and respect children", function (assert) {
+ const store = createStore();
+
+ const elem1 = store.createRecord("category", {
+ id: 1,
+ position: 0,
+ slug: "foo",
+ });
+
+ const child1 = store.createRecord("category", {
+ id: 4,
+ position: 1,
+ slug: "foochild",
+ parent_category_id: 1,
+ });
+
+ const child2 = store.createRecord("category", {
+ id: 5,
+ position: 2,
+ slug: "foochildchild",
+ parent_category_id: 4,
+ });
+
+ const elem2 = store.createRecord("category", {
+ id: 2,
+ position: 3,
+ slug: "bar",
+ });
+
+ const elem3 = store.createRecord("category", {
+ id: 3,
+ position: 4,
+ slug: "test",
+ });
+
+ const categories = [elem1, child1, child2, elem2, elem3];
+ const site = EmberObject.create({ categories: categories });
+ const reorderCategoriesController = this.owner.lookup(
+ "controller:reorder-categories"
+ );
+ reorderCategoriesController.setProperties({ site });
+ reorderCategoriesController.reorder();
+
+ reorderCategoriesController.actions.moveDown.call(
+ reorderCategoriesController,
+ elem1
+ );
+
+ assert.deepEqual(
+ reorderCategoriesController.get("categoriesOrdered").mapBy("slug"),
+ ["bar", "foo", "foochild", "foochildchild", "test"]
+ );
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
index 771a1594ac..3aa18c8d52 100644
--- a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
@@ -18,238 +18,243 @@ function setTemplates(lookupTemplateStrings) {
const DiscourseResolver = buildResolver("discourse");
-module("lib:resolver", {
- beforeEach() {
+module("Unit | Ember | resolver", function (hooks) {
+ hooks.beforeEach(function () {
originalTemplates = Ember.TEMPLATES;
Ember.TEMPLATES = {};
resolver = DiscourseResolver.create();
- },
+ });
- afterEach() {
+ hooks.afterEach(function () {
Ember.TEMPLATES = originalTemplates;
- },
-});
-
-test("finds templates in top level dir", (assert) => {
- setTemplates(["foobar", "fooBar", "foo_bar", "foo.bar"]);
-
- lookupTemplate(assert, "template:foobar", "foobar", "by lowcased name");
- lookupTemplate(assert, "template:fooBar", "fooBar", "by camel cased name");
- lookupTemplate(assert, "template:foo_bar", "foo_bar", "by underscored name");
- lookupTemplate(assert, "template:foo.bar", "foo.bar", "by dotted name");
-});
-
-test("finds templates in first-level subdir", (assert) => {
- setTemplates(["foo/bar_baz"]);
-
- lookupTemplate(
- assert,
- "template:foo/bar_baz",
- "foo/bar_baz",
- "with subdir defined by slash"
- );
- lookupTemplate(
- assert,
- "template:foo.bar_baz",
- "foo/bar_baz",
- "with subdir defined by dot"
- );
- lookupTemplate(
- assert,
- "template:fooBarBaz",
- "foo/bar_baz",
- "with subdir defined by first camel case and the rest of camel cases converted to underscores"
- );
- lookupTemplate(
- assert,
- "template:foo_bar_baz",
- "foo/bar_baz",
- "with subdir defined by first underscore"
- );
-});
-
-test("resolves precedence between overlapping top level dir and first level subdir templates", (assert) => {
- setTemplates(["fooBar", "foo_bar", "foo.bar", "foo/bar"]);
-
- lookupTemplate(
- assert,
- "template:foo.bar",
- "foo/bar",
- "preferring first level subdir for dotted name"
- );
- lookupTemplate(
- assert,
- "template:fooBar",
- "fooBar",
- "preferring top level dir for camel cased name"
- );
- lookupTemplate(
- assert,
- "template:foo_bar",
- "foo_bar",
- "preferring top level dir for underscored name"
- );
-});
-
-test("finds templates in subdir deeper than one level", (assert) => {
- setTemplates(["foo/bar/baz/qux"]);
-
- lookupTemplate(
- assert,
- "template:foo/bar/baz/qux",
- "foo/bar/baz/qux",
- "for subdirs defined by slashes"
- );
- lookupTemplate(
- assert,
- "template:foo.bar.baz.qux",
- "foo/bar/baz/qux",
- "for subdirs defined by dots"
- );
- lookupTemplate(
- assert,
- "template:foo/bar/bazQux",
- "foo/bar/baz/qux",
- "for subdirs defined by slashes plus one camel case"
- );
- lookupTemplate(
- assert,
- "template:foo/bar/baz_qux",
- "foo/bar/baz/qux",
- "for subdirs defined by slashes plus one underscore"
- );
-
- lookupTemplate(
- assert,
- "template:fooBarBazQux",
- undefined,
- "but not for subdirs defined by more than one camel case"
- );
- lookupTemplate(
- assert,
- "template:foo_bar_baz_qux",
- undefined,
- "but not for subdirs defined by more than one underscore"
- );
- lookupTemplate(
- assert,
- "template:foo.bar.bazQux",
- undefined,
- "but not for subdirs defined by dots plus one camel case"
- );
- lookupTemplate(
- assert,
- "template:foo.bar.baz_qux",
- undefined,
- "but not for subdirs defined by dots plus one underscore"
- );
-});
-
-test("resolves mobile templates to 'mobile/' namespace", (assert) => {
- setTemplates(["mobile/foo", "bar", "mobile/bar", "baz"]);
-
- setResolverOption("mobileView", true);
-
- lookupTemplate(
- assert,
- "template:foo",
- "mobile/foo",
- "finding mobile version even if normal one is not present"
- );
- lookupTemplate(
- assert,
- "template:bar",
- "mobile/bar",
- "preferring mobile version when both mobile and normal versions are present"
- );
- lookupTemplate(
- assert,
- "template:baz",
- "baz",
- "falling back to a normal version when mobile version is not present"
- );
-});
-
-test("resolves plugin templates to 'javascripts/' namespace", (assert) => {
- setTemplates(["javascripts/foo", "bar", "javascripts/bar", "baz"]);
-
- lookupTemplate(
- assert,
- "template:foo",
- "javascripts/foo",
- "finding plugin version even if normal one is not present"
- );
- lookupTemplate(
- assert,
- "template:bar",
- "javascripts/bar",
- "preferring plugin version when both versions are present"
- );
- lookupTemplate(
- assert,
- "template:baz",
- "baz",
- "falling back to a normal version when plugin version is not present"
- );
-});
-
-test("resolves templates with 'admin' prefix to 'admin/templates/' namespace", (assert) => {
- setTemplates([
- "admin/templates/foo",
- "adminBar",
- "admin_bar",
- "admin.bar",
- "admin/templates/bar",
- ]);
-
- lookupTemplate(
- assert,
- "template:adminFoo",
- "admin/templates/foo",
- "when prefix is separated by camel case"
- );
- lookupTemplate(
- assert,
- "template:admin_foo",
- "admin/templates/foo",
- "when prefix is separated by underscore"
- );
- lookupTemplate(
- assert,
- "template:admin.foo",
- "admin/templates/foo",
- "when prefix is separated by dot"
- );
-
- lookupTemplate(
- assert,
- "template:adminfoo",
- undefined,
- "but not when prefix is not separated in any way"
- );
- lookupTemplate(
- assert,
- "template:adminBar",
- "adminBar",
- "but not when template with the exact camel cased name exists"
- );
- lookupTemplate(
- assert,
- "template:admin_bar",
- "admin_bar",
- "but not when template with the exact underscored name exists"
- );
- lookupTemplate(
- assert,
- "template:admin.bar",
- "admin.bar",
- "but not when template with the exact dotted name exists"
- );
-});
-
-test("returns 'not_found' template when template name cannot be resolved", (assert) => {
- setTemplates(["not_found"]);
-
- lookupTemplate(assert, "template:foo/bar/baz", "not_found", "");
+ });
+
+ test("finds templates in top level dir", function (assert) {
+ setTemplates(["foobar", "fooBar", "foo_bar", "foo.bar"]);
+
+ lookupTemplate(assert, "template:foobar", "foobar", "by lowcased name");
+ lookupTemplate(assert, "template:fooBar", "fooBar", "by camel cased name");
+ lookupTemplate(
+ assert,
+ "template:foo_bar",
+ "foo_bar",
+ "by underscored name"
+ );
+ lookupTemplate(assert, "template:foo.bar", "foo.bar", "by dotted name");
+ });
+
+ test("finds templates in first-level subdir", function (assert) {
+ setTemplates(["foo/bar_baz"]);
+
+ lookupTemplate(
+ assert,
+ "template:foo/bar_baz",
+ "foo/bar_baz",
+ "with subdir defined by slash"
+ );
+ lookupTemplate(
+ assert,
+ "template:foo.bar_baz",
+ "foo/bar_baz",
+ "with subdir defined by dot"
+ );
+ lookupTemplate(
+ assert,
+ "template:fooBarBaz",
+ "foo/bar_baz",
+ "with subdir defined by first camel case and the rest of camel cases converted to underscores"
+ );
+ lookupTemplate(
+ assert,
+ "template:foo_bar_baz",
+ "foo/bar_baz",
+ "with subdir defined by first underscore"
+ );
+ });
+
+ test("resolves precedence between overlapping top level dir and first level subdir templates", function (assert) {
+ setTemplates(["fooBar", "foo_bar", "foo.bar", "foo/bar"]);
+
+ lookupTemplate(
+ assert,
+ "template:foo.bar",
+ "foo/bar",
+ "preferring first level subdir for dotted name"
+ );
+ lookupTemplate(
+ assert,
+ "template:fooBar",
+ "fooBar",
+ "preferring top level dir for camel cased name"
+ );
+ lookupTemplate(
+ assert,
+ "template:foo_bar",
+ "foo_bar",
+ "preferring top level dir for underscored name"
+ );
+ });
+
+ test("finds templates in subdir deeper than one level", function (assert) {
+ setTemplates(["foo/bar/baz/qux"]);
+
+ lookupTemplate(
+ assert,
+ "template:foo/bar/baz/qux",
+ "foo/bar/baz/qux",
+ "for subdirs defined by slashes"
+ );
+ lookupTemplate(
+ assert,
+ "template:foo.bar.baz.qux",
+ "foo/bar/baz/qux",
+ "for subdirs defined by dots"
+ );
+ lookupTemplate(
+ assert,
+ "template:foo/bar/bazQux",
+ "foo/bar/baz/qux",
+ "for subdirs defined by slashes plus one camel case"
+ );
+ lookupTemplate(
+ assert,
+ "template:foo/bar/baz_qux",
+ "foo/bar/baz/qux",
+ "for subdirs defined by slashes plus one underscore"
+ );
+
+ lookupTemplate(
+ assert,
+ "template:fooBarBazQux",
+ undefined,
+ "but not for subdirs defined by more than one camel case"
+ );
+ lookupTemplate(
+ assert,
+ "template:foo_bar_baz_qux",
+ undefined,
+ "but not for subdirs defined by more than one underscore"
+ );
+ lookupTemplate(
+ assert,
+ "template:foo.bar.bazQux",
+ undefined,
+ "but not for subdirs defined by dots plus one camel case"
+ );
+ lookupTemplate(
+ assert,
+ "template:foo.bar.baz_qux",
+ undefined,
+ "but not for subdirs defined by dots plus one underscore"
+ );
+ });
+
+ test("resolves mobile templates to 'mobile/' namespace", function (assert) {
+ setTemplates(["mobile/foo", "bar", "mobile/bar", "baz"]);
+
+ setResolverOption("mobileView", true);
+
+ lookupTemplate(
+ assert,
+ "template:foo",
+ "mobile/foo",
+ "finding mobile version even if normal one is not present"
+ );
+ lookupTemplate(
+ assert,
+ "template:bar",
+ "mobile/bar",
+ "preferring mobile version when both mobile and normal versions are present"
+ );
+ lookupTemplate(
+ assert,
+ "template:baz",
+ "baz",
+ "falling back to a normal version when mobile version is not present"
+ );
+ });
+
+ test("resolves plugin templates to 'javascripts/' namespace", function (assert) {
+ setTemplates(["javascripts/foo", "bar", "javascripts/bar", "baz"]);
+
+ lookupTemplate(
+ assert,
+ "template:foo",
+ "javascripts/foo",
+ "finding plugin version even if normal one is not present"
+ );
+ lookupTemplate(
+ assert,
+ "template:bar",
+ "javascripts/bar",
+ "preferring plugin version when both versions are present"
+ );
+ lookupTemplate(
+ assert,
+ "template:baz",
+ "baz",
+ "falling back to a normal version when plugin version is not present"
+ );
+ });
+
+ test("resolves templates with 'admin' prefix to 'admin/templates/' namespace", function (assert) {
+ setTemplates([
+ "admin/templates/foo",
+ "adminBar",
+ "admin_bar",
+ "admin.bar",
+ "admin/templates/bar",
+ ]);
+
+ lookupTemplate(
+ assert,
+ "template:adminFoo",
+ "admin/templates/foo",
+ "when prefix is separated by camel case"
+ );
+ lookupTemplate(
+ assert,
+ "template:admin_foo",
+ "admin/templates/foo",
+ "when prefix is separated by underscore"
+ );
+ lookupTemplate(
+ assert,
+ "template:admin.foo",
+ "admin/templates/foo",
+ "when prefix is separated by dot"
+ );
+
+ lookupTemplate(
+ assert,
+ "template:adminfoo",
+ undefined,
+ "but not when prefix is not separated in any way"
+ );
+ lookupTemplate(
+ assert,
+ "template:adminBar",
+ "adminBar",
+ "but not when template with the exact camel cased name exists"
+ );
+ lookupTemplate(
+ assert,
+ "template:admin_bar",
+ "admin_bar",
+ "but not when template with the exact underscored name exists"
+ );
+ lookupTemplate(
+ assert,
+ "template:admin.bar",
+ "admin.bar",
+ "but not when template with the exact dotted name exists"
+ );
+ });
+
+ test("returns 'not_found' template when template name cannot be resolved", function (assert) {
+ setTemplates(["not_found"]);
+
+ lookupTemplate(assert, "template:foo/bar/baz", "not_found", "");
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/allow-lister-test.js b/app/assets/javascripts/discourse/tests/unit/lib/allow-lister-test.js
index c700d220ce..683ab4c0fd 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/allow-lister-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/allow-lister-test.js
@@ -1,59 +1,59 @@
import { test, module } from "qunit";
import AllowLister from "pretty-text/allow-lister";
-module("lib:allowLister");
+module("Unit | Utility | allowLister", function () {
+ test("allowLister", function (assert) {
+ const allowLister = new AllowLister();
-test("allowLister", (assert) => {
- const allowLister = new AllowLister();
+ assert.ok(
+ Object.keys(allowLister.getAllowList().tagList).length > 1,
+ "should have some defaults"
+ );
- assert.ok(
- Object.keys(allowLister.getAllowList().tagList).length > 1,
- "should have some defaults"
- );
+ allowLister.disable("default");
- allowLister.disable("default");
+ assert.ok(
+ Object.keys(allowLister.getAllowList().tagList).length === 0,
+ "should have no defaults if disabled"
+ );
- assert.ok(
- Object.keys(allowLister.getAllowList().tagList).length === 0,
- "should have no defaults if disabled"
- );
+ allowLister.allowListFeature("test", [
+ "custom.foo",
+ "custom.baz",
+ "custom[data-*]",
+ "custom[rel=nofollow]",
+ ]);
- allowLister.allowListFeature("test", [
- "custom.foo",
- "custom.baz",
- "custom[data-*]",
- "custom[rel=nofollow]",
- ]);
+ allowLister.allowListFeature("test", ["custom[rel=test]"]);
- allowLister.allowListFeature("test", ["custom[rel=test]"]);
+ allowLister.enable("test");
- allowLister.enable("test");
-
- assert.deepEqual(
- allowLister.getAllowList(),
- {
- tagList: {
- custom: [],
- },
- attrList: {
- custom: {
- class: ["foo", "baz"],
- "data-*": ["*"],
- rel: ["nofollow", "test"],
+ assert.deepEqual(
+ allowLister.getAllowList(),
+ {
+ tagList: {
+ custom: [],
+ },
+ attrList: {
+ custom: {
+ class: ["foo", "baz"],
+ "data-*": ["*"],
+ rel: ["nofollow", "test"],
+ },
},
},
- },
- "Expecting a correct white list"
- );
+ "Expecting a correct white list"
+ );
- allowLister.disable("test");
+ allowLister.disable("test");
- assert.deepEqual(
- allowLister.getAllowList(),
- {
- tagList: {},
- attrList: {},
- },
- "Expecting an empty white list"
- );
+ assert.deepEqual(
+ allowLister.getAllowList(),
+ {
+ tagList: {},
+ attrList: {},
+ },
+ "Expecting an empty white list"
+ );
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/bbcode-test.js b/app/assets/javascripts/discourse/tests/unit/lib/bbcode-test.js
deleted file mode 100644
index 41530ac39c..0000000000
--- a/app/assets/javascripts/discourse/tests/unit/lib/bbcode-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { test, module } from "qunit";
-import { parseBBCodeTag } from "pretty-text/engines/discourse-markdown/bbcode-block";
-
-module("lib:pretty-text:bbcode");
-
-test("block with multiple quoted attributes", (assert) => {
- const parsed = parseBBCodeTag('[test one="foo" two="bar bar"]', 0, 30);
-
- assert.equal(parsed.tag, "test");
- assert.equal(parsed.attrs.one, "foo");
- assert.equal(parsed.attrs.two, "bar bar");
-});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/bookmark-test.js b/app/assets/javascripts/discourse/tests/unit/lib/bookmark-test.js
index 97ca58a21e..4635b46997 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/bookmark-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/bookmark-test.js
@@ -3,45 +3,45 @@ import { test, module } from "qunit";
import { formattedReminderTime } from "discourse/lib/bookmark";
import { fakeTime } from "discourse/tests/helpers/qunit-helpers";
-module("lib:bookmark", {
- beforeEach() {
+module("Unit | Utility | bookmark", function (hooks) {
+ hooks.beforeEach(function () {
fakeTime("2020-04-11 08:00:00", "Australia/Brisbane");
- },
+ });
- afterEach() {
+ hooks.afterEach(function () {
sinon.restore();
- },
-});
+ });
-test("formattedReminderTime works when the reminder time is tomorrow", (assert) => {
- let reminderAt = "2020-04-12 09:45:00";
- let reminderAtDate = moment
- .tz(reminderAt, "Australia/Brisbane")
- .format("H:mm a");
- assert.equal(
- formattedReminderTime(reminderAt, "Australia/Brisbane"),
- "tomorrow at " + reminderAtDate
- );
-});
+ test("formattedReminderTime works when the reminder time is tomorrow", function (assert) {
+ let reminderAt = "2020-04-12 09:45:00";
+ let reminderAtDate = moment
+ .tz(reminderAt, "Australia/Brisbane")
+ .format("H:mm a");
+ assert.equal(
+ formattedReminderTime(reminderAt, "Australia/Brisbane"),
+ "tomorrow at " + reminderAtDate
+ );
+ });
-test("formattedReminderTime works when the reminder time is today", (assert) => {
- let reminderAt = "2020-04-11 09:45:00";
- let reminderAtDate = moment
- .tz(reminderAt, "Australia/Brisbane")
- .format("H:mm a");
- assert.equal(
- formattedReminderTime(reminderAt, "Australia/Brisbane"),
- "today at " + reminderAtDate
- );
-});
+ test("formattedReminderTime works when the reminder time is today", function (assert) {
+ let reminderAt = "2020-04-11 09:45:00";
+ let reminderAtDate = moment
+ .tz(reminderAt, "Australia/Brisbane")
+ .format("H:mm a");
+ assert.equal(
+ formattedReminderTime(reminderAt, "Australia/Brisbane"),
+ "today at " + reminderAtDate
+ );
+ });
-test("formattedReminderTime works when the reminder time is in the future", (assert) => {
- let reminderAt = "2020-04-15 09:45:00";
- let reminderAtDate = moment
- .tz(reminderAt, "Australia/Brisbane")
- .format("H:mm a");
- assert.equal(
- formattedReminderTime(reminderAt, "Australia/Brisbane"),
- "at Apr 15, 2020 " + reminderAtDate
- );
+ test("formattedReminderTime works when the reminder time is in the future", function (assert) {
+ let reminderAt = "2020-04-15 09:45:00";
+ let reminderAtDate = moment
+ .tz(reminderAt, "Australia/Brisbane")
+ .format("H:mm a");
+ assert.equal(
+ formattedReminderTime(reminderAt, "Australia/Brisbane"),
+ "at Apr 15, 2020 " + reminderAtDate
+ );
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/break-string-test.js b/app/assets/javascripts/discourse/tests/unit/lib/break-string-test.js
index 1a711d6c7d..35a13b7607 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/break-string-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/break-string-test.js
@@ -1,21 +1,19 @@
import { test, module } from "qunit";
/* global BreakString:true */
-module("lib:breakString", {});
+module("Unit | Utility | breakString", function () {
+ test("breakString", function (assert) {
+ const b = (s, hint) => new BreakString(s).break(hint);
-test("breakString", (assert) => {
- var b = function (s, hint) {
- return new BreakString(s).break(hint);
- };
-
- assert.equal(b("hello"), "hello");
- assert.equal(b("helloworld"), "helloworld");
- assert.equal(b("HeMans11"), "He
Mans11");
- assert.equal(b("he_man"), "he_man");
- assert.equal(b("he11111"), "he11111");
- assert.equal(b("HRCBob"), "HRCBob");
- assert.equal(
- b("bobmarleytoo", "Bob Marley Too"),
- "bobmarleytoo"
- );
+ assert.equal(b("hello"), "hello");
+ assert.equal(b("helloworld"), "helloworld");
+ assert.equal(b("HeMans11"), "HeMans11");
+ assert.equal(b("he_man"), "he_man");
+ assert.equal(b("he11111"), "he11111");
+ assert.equal(b("HRCBob"), "HRCBob");
+ assert.equal(
+ b("bobmarleytoo", "Bob Marley Too"),
+ "bobmarleytoo"
+ );
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js b/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js
index 665904c96e..5f59b74e4c 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js
@@ -3,150 +3,170 @@ import createStore from "discourse/tests/helpers/create-store";
import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
import Site from "discourse/models/site";
import sinon from "sinon";
-
-discourseModule("lib:category-link");
-
import { categoryBadgeHTML } from "discourse/helpers/category-link";
-test("categoryBadge without a category", (assert) => {
- assert.blank(categoryBadgeHTML(), "it returns no HTML");
-});
-
-test("Regular categoryBadge", (assert) => {
- const store = createStore();
- const category = store.createRecord("category", {
- name: "hello",
- id: 123,
- description_text: "cool description",
- color: "ff0",
- text_color: "f00",
- });
- const tag = $.parseHTML(categoryBadgeHTML(category))[0];
-
- assert.equal(tag.tagName, "A", "it creates a `a` wrapper tag");
- assert.equal(
- tag.className.trim(),
- "badge-wrapper",
- "it has the correct class"
- );
-
- const label = tag.children[1];
- assert.equal(label.title, "cool description", "it has the correct title");
- assert.equal(
- label.children[0].innerText,
- "hello",
- "it has the category name"
- );
-});
-
-test("undefined color", (assert) => {
- const store = createStore();
- const noColor = store.createRecord("category", { name: "hello", id: 123 });
- const tag = $.parseHTML(categoryBadgeHTML(noColor))[0];
-
- assert.blank(
- tag.attributes["style"],
- "it has no color style because there are no colors"
- );
-});
-
-test("topic count", (assert) => {
- const store = createStore();
- const category = store.createRecord("category", { name: "hello", id: 123 });
-
- assert.equal(
- categoryBadgeHTML(category).indexOf("topic-count"),
- -1,
- "it does not include topic count by default"
- );
- assert.ok(
- categoryBadgeHTML(category, { topicCount: 20 }).indexOf("topic-count") > 20,
- "is included when specified"
- );
-});
-
-test("allowUncategorized", (assert) => {
- const store = createStore();
- const uncategorized = store.createRecord("category", {
- name: "uncategorized",
- id: 345,
+discourseModule("Unit | Utility | category-badge", function () {
+ test("categoryBadge without a category", function (assert) {
+ assert.blank(categoryBadgeHTML(), "it returns no HTML");
});
- sinon
- .stub(Site, "currentProp")
- .withArgs("uncategorized_category_id")
- .returns(345);
+ test("Regular categoryBadge", function (assert) {
+ const store = createStore();
+ const category = store.createRecord("category", {
+ name: "hello",
+ id: 123,
+ description_text: "cool description",
+ color: "ff0",
+ text_color: "f00",
+ });
+ const tag = $.parseHTML(categoryBadgeHTML(category))[0];
- assert.blank(
- categoryBadgeHTML(uncategorized),
- "it doesn't return HTML for uncategorized by default"
- );
- assert.present(
- categoryBadgeHTML(uncategorized, { allowUncategorized: true }),
- "it returns HTML"
- );
-});
-
-test("category names are wrapped in dir-spans", function (assert) {
- this.siteSettings.support_mixed_text_direction = true;
- const store = createStore();
- const rtlCategory = store.createRecord("category", {
- name: "תכנות עם Ruby",
- id: 123,
- description_text: "cool description",
- color: "ff0",
- text_color: "f00",
- });
-
- const ltrCategory = store.createRecord("category", {
- name: "Programming in Ruby",
- id: 234,
- });
-
- let tag = $.parseHTML(categoryBadgeHTML(rtlCategory))[0];
- let dirSpan = tag.children[1].children[0];
- assert.equal(dirSpan.dir, "rtl");
-
- tag = $.parseHTML(categoryBadgeHTML(ltrCategory))[0];
- dirSpan = tag.children[1].children[0];
- assert.equal(dirSpan.dir, "ltr");
-});
-
-test("recursive", function (assert) {
- const store = createStore();
-
- const foo = store.createRecord("category", {
- name: "foo",
- id: 1,
- });
-
- const bar = store.createRecord("category", {
- name: "bar",
- id: 2,
- parent_category_id: foo.id,
- });
-
- const baz = store.createRecord("category", {
- name: "baz",
- id: 3,
- parent_category_id: bar.id,
- });
-
- this.siteSettings.max_category_nesting = 0;
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("baz") !== -1);
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("bar") === -1);
-
- this.siteSettings.max_category_nesting = 1;
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("baz") !== -1);
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("bar") === -1);
-
- this.siteSettings.max_category_nesting = 2;
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("baz") !== -1);
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("bar") !== -1);
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("foo") === -1);
-
- this.siteSettings.max_category_nesting = 3;
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("baz") !== -1);
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("bar") !== -1);
- assert.ok(categoryBadgeHTML(baz, { recursive: true }).indexOf("foo") !== -1);
+ assert.equal(tag.tagName, "A", "it creates a `a` wrapper tag");
+ assert.equal(
+ tag.className.trim(),
+ "badge-wrapper",
+ "it has the correct class"
+ );
+
+ const label = tag.children[1];
+ assert.equal(label.title, "cool description", "it has the correct title");
+ assert.equal(
+ label.children[0].innerText,
+ "hello",
+ "it has the category name"
+ );
+ });
+
+ test("undefined color", function (assert) {
+ const store = createStore();
+ const noColor = store.createRecord("category", { name: "hello", id: 123 });
+ const tag = $.parseHTML(categoryBadgeHTML(noColor))[0];
+
+ assert.blank(
+ tag.attributes["style"],
+ "it has no color style because there are no colors"
+ );
+ });
+
+ test("topic count", function (assert) {
+ const store = createStore();
+ const category = store.createRecord("category", { name: "hello", id: 123 });
+
+ assert.equal(
+ categoryBadgeHTML(category).indexOf("topic-count"),
+ -1,
+ "it does not include topic count by default"
+ );
+ assert.ok(
+ categoryBadgeHTML(category, { topicCount: 20 }).indexOf("topic-count") >
+ 20,
+ "is included when specified"
+ );
+ });
+
+ test("allowUncategorized", function (assert) {
+ const store = createStore();
+ const uncategorized = store.createRecord("category", {
+ name: "uncategorized",
+ id: 345,
+ });
+
+ sinon
+ .stub(Site, "currentProp")
+ .withArgs("uncategorized_category_id")
+ .returns(345);
+
+ assert.blank(
+ categoryBadgeHTML(uncategorized),
+ "it doesn't return HTML for uncategorized by default"
+ );
+ assert.present(
+ categoryBadgeHTML(uncategorized, { allowUncategorized: true }),
+ "it returns HTML"
+ );
+ });
+
+ test("category names are wrapped in dir-spans", function (assert) {
+ this.siteSettings.support_mixed_text_direction = true;
+ const store = createStore();
+ const rtlCategory = store.createRecord("category", {
+ name: "תכנות עם Ruby",
+ id: 123,
+ description_text: "cool description",
+ color: "ff0",
+ text_color: "f00",
+ });
+
+ const ltrCategory = store.createRecord("category", {
+ name: "Programming in Ruby",
+ id: 234,
+ });
+
+ let tag = $.parseHTML(categoryBadgeHTML(rtlCategory))[0];
+ let dirSpan = tag.children[1].children[0];
+ assert.equal(dirSpan.dir, "rtl");
+
+ tag = $.parseHTML(categoryBadgeHTML(ltrCategory))[0];
+ dirSpan = tag.children[1].children[0];
+ assert.equal(dirSpan.dir, "ltr");
+ });
+
+ test("recursive", function (assert) {
+ const store = createStore();
+
+ const foo = store.createRecord("category", {
+ name: "foo",
+ id: 1,
+ });
+
+ const bar = store.createRecord("category", {
+ name: "bar",
+ id: 2,
+ parent_category_id: foo.id,
+ });
+
+ const baz = store.createRecord("category", {
+ name: "baz",
+ id: 3,
+ parent_category_id: bar.id,
+ });
+
+ this.siteSettings.max_category_nesting = 0;
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("baz") !== -1
+ );
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("bar") === -1
+ );
+
+ this.siteSettings.max_category_nesting = 1;
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("baz") !== -1
+ );
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("bar") === -1
+ );
+
+ this.siteSettings.max_category_nesting = 2;
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("baz") !== -1
+ );
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("bar") !== -1
+ );
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("foo") === -1
+ );
+
+ this.siteSettings.max_category_nesting = 3;
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("baz") !== -1
+ );
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("bar") !== -1
+ );
+ assert.ok(
+ categoryBadgeHTML(baz, { recursive: true }).indexOf("foo") !== -1
+ );
+ });
});
diff --git a/app/assets/javascripts/discourse/tests/unit/lib/click-track-edit-history-test.js b/app/assets/javascripts/discourse/tests/unit/lib/click-track-edit-history-test.js
index 326386a2b2..ae6b16e66d 100644
--- a/app/assets/javascripts/discourse/tests/unit/lib/click-track-edit-history-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/lib/click-track-edit-history-test.js
@@ -6,8 +6,14 @@ import { fixture, logIn } from "discourse/tests/helpers/qunit-helpers";
import User from "discourse/models/user";
import pretender from "discourse/tests/helpers/create-pretender";
-module("lib:click-track-edit-history", {
- beforeEach() {
+const track = ClickTrack.trackClick;
+
+function generateClickEventOn(selector) {
+ return $.Event("click", { currentTarget: fixture(selector).first() });
+}
+
+module("Unit | Utility | click-track-edit-history", function (hooks) {
+ hooks.beforeEach(function () {
logIn();
let win = { focus: function () {} };
@@ -51,59 +57,53 @@ module("lib:click-track-edit-history", {