Remove Discourse.SiteSettings from tests (#10193)

* Remove unused Discourse.SiteSettings

* Remove `Discourse.SiteSettings` from many tests

* REFACTOR: `lib:formatter` was using a lot of leaky state

* Remove more `Discourse.SiteSettings` from tests

* More SiteSettings removed from tests
This commit is contained in:
Robin Ward
2020-07-09 15:54:53 -04:00
committed by GitHub
parent b1c6ff9e1c
commit 5b276af921
19 changed files with 252 additions and 218 deletions
@@ -27,8 +27,8 @@ QUnit.test("when login not required", async assert => {
);
});
QUnit.test("when login required", async assert => {
Discourse.SiteSettings.login_required = true;
QUnit.test("when login required", async function(assert) {
this.siteSettings.login_required = true;
await visit("/");
assert.equal(currentPath(), "login", "it redirects to the login page");
@@ -720,8 +720,6 @@ QUnit.test("Loading draft also replaces the recipients", async assert => {
QUnit.test(
"Deleting the text content of the first post in a private message",
async assert => {
Discourse.SiteSettings.allow_uncategorized_topics = false;
await visit("/t/34");
await click("#post_1 .d-icon-ellipsis-h");
@@ -30,8 +30,8 @@ QUnit.test("when skip is disabled (default)", async assert => {
assert.ok(exists("#new-account-username"), "it shows the fields");
});
QUnit.test("when skip is enabled", async assert => {
Discourse.SiteSettings.external_auth_skip_create_confirm = true;
QUnit.test("when skip is enabled", async function(assert) {
this.siteSettings.external_auth_skip_create_confirm = true;
await visit("/");
assert.ok(
@@ -4,22 +4,26 @@ acceptance("Email Disabled Banner", {
loggedIn: true
});
QUnit.test("shows banner when required", async assert => {
Discourse.set("SiteSettings.disable_emails", "no");
QUnit.test("when disabled", async function(assert) {
this.siteSettings.disable_emails = "no";
await visit("/");
assert.notOk(
exists(".alert-emails-disabled"),
"alert is not displayed when email enabled"
);
});
Discourse.set("SiteSettings.disable_emails", "yes");
QUnit.test("when enabled", async function(assert) {
this.siteSettings.disable_emails = "yes";
await visit("/latest");
assert.ok(
exists(".alert-emails-disabled"),
"alert is displayed when email disabled"
);
});
Discourse.set("SiteSettings.disable_emails", "non-staff");
QUnit.test("when non-staff", async function(assert) {
this.siteSettings.disable_emails = "non-staff";
await visit("/");
assert.ok(
exists(".alert-emails-disabled"),
@@ -12,9 +12,9 @@ acceptance("Enforce Second Factor", {
}
});
QUnit.test("as an admin", async assert => {
QUnit.test("as an admin", async function(assert) {
await visit("/u/eviltrout/preferences/second-factor");
Discourse.SiteSettings.enforce_second_factor = "staff";
this.siteSettings.enforce_second_factor = "staff";
await visit("/u/eviltrout/summary");
@@ -34,11 +34,11 @@ QUnit.test("as an admin", async assert => {
);
});
QUnit.test("as a user", async assert => {
QUnit.test("as a user", async function(assert) {
updateCurrentUser({ moderator: false, admin: false });
await visit("/u/eviltrout/preferences/second-factor");
Discourse.SiteSettings.enforce_second_factor = "all";
this.siteSettings.enforce_second_factor = "all";
await visit("/u/eviltrout/summary");
@@ -58,12 +58,12 @@ QUnit.test("as a user", async assert => {
);
});
QUnit.test("as an anonymous user", async assert => {
QUnit.test("as an anonymous user", async function(assert) {
updateCurrentUser({ moderator: false, admin: false, is_anonymous: true });
await visit("/u/eviltrout/preferences/second-factor");
Discourse.SiteSettings.enforce_second_factor = "all";
Discourse.SiteSettings.allow_anonymous_posting = true;
this.siteSettings.enforce_second_factor = "all";
this.siteSettings.allow_anonymous_posting = true;
await visit("/u/eviltrout/summary");
+2 -2
View File
@@ -22,7 +22,7 @@ const response = object => {
return [200, { "Content-Type": "application/json" }, object];
};
QUnit.test("Anonymous Viewing Group", async assert => {
QUnit.test("Anonymous Viewing Group", async function(assert) {
await visit("/g/discourse");
assert.equal(
@@ -63,7 +63,7 @@ QUnit.test("Anonymous Viewing Group", async assert => {
I18n.t("groups.index.all").toLowerCase()
);
Discourse.SiteSettings.enable_group_directory = false;
this.siteSettings.enable_group_directory = false;
await visit("/g");
await visit("/g/discourse");
@@ -2,14 +2,14 @@ import { acceptance } from "helpers/qunit-helpers";
acceptance("Login redirect", {});
QUnit.test("redirects login to default homepage", async assert => {
QUnit.test("redirects login to default homepage", async function(assert) {
await visit("/login");
assert.equal(
currentPath(),
"discovery.latest",
"it works when latest is the homepage"
);
Discourse.SiteSettings.top_menu = "categories|latest|top|hot";
this.siteSettings.top_menu = "categories|latest|top|hot";
await visit("/login");
assert.equal(
+2 -2
View File
@@ -190,8 +190,8 @@ QUnit.test("Updating the topic title with unicode emojis", async assert => {
QUnit.test(
"Updating the topic title with unicode emojis without whitespaces",
async assert => {
Discourse.SiteSettings.enable_inline_emoji_translation = true;
async function(assert) {
this.siteSettings.enable_inline_emoji_translation = true;
await visit("/t/internationalization-localization/280");
await click("#topic-title .d-icon-pencil-alt");