DEV: Add missing import, de-jQuerify (#13461)

This commit is contained in:
Jarek Radosz 2021-06-22 00:09:49 +02:00 committed by GitHub
parent 83a6ad32ff
commit c3e4389b81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions

View File

@ -1,7 +1,7 @@
import {
acceptance,
exists,
query,
queryAll,
} from "discourse/tests/helpers/qunit-helpers";
import selectKit from "discourse/tests/helpers/select-kit-helper";
import { click, currentRouteName, fillIn, visit } from "@ember/test-helpers";
@ -14,7 +14,7 @@ acceptance("Managing Group Email Settings - SMTP Disabled", function (needs) {
test("When SiteSetting.enable_smtp is false", async function (assert) {
await visit("/g/discourse/manage/email");
assert.notOk(
queryAll(".user-secondary-navigation").text().includes("Email"),
query(".user-secondary-navigation").innerText.includes("Email"),
"email link is not shown in the sidebar"
);
assert.equal(
@ -34,7 +34,7 @@ acceptance(
test("When SiteSetting.enable_smtp is true but SiteSetting.enable_imap is false", async function (assert) {
await visit("/g/discourse/manage/email");
assert.ok(
queryAll(".user-secondary-navigation").text().includes("Email"),
query(".user-secondary-navigation").innerText.includes("Email"),
"email link is shown in the sidebar"
);
assert.equal(
@ -72,7 +72,7 @@ acceptance(
test("enabling SMTP, testing, and saving", async function (assert) {
await visit("/g/discourse/manage/email");
assert.ok(
queryAll(".user-secondary-navigation").text().includes("Email"),
query(".user-secondary-navigation").innerText.includes("Email"),
"email link is shown in the sidebar"
);
assert.ok(
@ -85,12 +85,12 @@ acceptance(
await click("#prefill_smtp_gmail");
assert.equal(
queryAll("input[name='smtp_server']").val(),
query("input[name='smtp_server']").value,
"smtp.gmail.com",
"prefills SMTP server settings for gmail"
);
assert.equal(
queryAll("input[name='smtp_port']").val(),
query("input[name='smtp_port']").value,
"587",
"prefills SMTP port settings for gmail"
);
@ -113,7 +113,7 @@ acceptance(
await click(".group-manage-save");
assert.equal(
queryAll(".group-manage-save-button > span").text(),
query(".group-manage-save-button > span").innerText,
"Saved!"
);
@ -124,7 +124,7 @@ acceptance(
await click("#enable_smtp");
assert.equal(
queryAll(".modal-body").text(),
query(".modal-body").innerText,
I18n.t("groups.manage.email.smtp_disable_confirm"),
"shows a confirm dialogue warning SMTP settings will be wiped"
);
@ -156,12 +156,12 @@ acceptance(
await click("#prefill_imap_gmail");
assert.equal(
queryAll("input[name='imap_server']").val(),
query("input[name='imap_server']").value,
"imap.gmail.com",
"prefills IMAP server settings for gmail"
);
assert.equal(
queryAll("input[name='imap_port']").val(),
query("input[name='imap_port']").value,
"993",
"prefills IMAP port settings for gmail"
);
@ -176,7 +176,7 @@ acceptance(
await click(".group-manage-save");
assert.equal(
queryAll(".group-manage-save-button > span").text(),
query(".group-manage-save-button > span").innerText,
"Saved!"
);
@ -200,7 +200,7 @@ acceptance(
await click("#enable_imap");
assert.equal(
queryAll(".modal-body").text(),
query(".modal-body").innerText,
I18n.t("groups.manage.email.imap_disable_confirm"),
"shows a confirm dialogue warning IMAP settings will be wiped"
);
@ -360,7 +360,7 @@ acceptance(
// await click(".test-smtp-settings");
// assert.equal(
// queryAll(".modal-body").text(),
// query(".modal-body").innerText,
// "There was an issue with the SMTP credentials provided, check the username and password and try again.",
// "shows a dialogue with the error message from the server"
// );

View File

@ -1,7 +1,11 @@
import { currentURL, triggerKeyEvent, visit } from "@ember/test-helpers";
import { cloneJSON } from "discourse-common/lib/object";
import I18n from "I18n";
import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
import {
acceptance,
exists,
query,
} from "discourse/tests/helpers/qunit-helpers";
import DiscoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";
import { test } from "qunit";
@ -87,7 +91,7 @@ acceptance("Keyboard Shortcuts - Authenticated Users", function (needs) {
await triggerKeyEvent(document, "keypress", "t".charCodeAt(0));
assert.ok(exists("#dismiss-read-confirm"));
assert.equal(
queryAll(".modal-body").text().trim(),
query(".modal-body").innerText,
I18n.t("topics.bulk.also_dismiss_topics")
);
await click("#dismiss-read-confirm");
@ -107,7 +111,7 @@ acceptance("Keyboard Shortcuts - Authenticated Users", function (needs) {
await triggerKeyEvent(document, "keypress", "t".charCodeAt(0));
assert.ok(exists("#dismiss-read-confirm"));
assert.equal(
queryAll(".modal-body").text().trim(),
query(".modal-body").innerText,
"Stop tracking these topics so they never show up as unread for me again"
);
await click("#dismiss-read-confirm");