afdb4a084a
When installing themes using the "Install this theme component" button on meta.discourse.org, we pass the repo name and URL via query params. However, these stick. So if a user cancels the installation, on the next navigation to the same route, they'll see the modal again. This PR clears the query params of the controller when dismissing the modal.
119 lines
4.3 KiB
JavaScript
119 lines
4.3 KiB
JavaScript
import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
|
|
import { click, currentURL, fillIn, visit } from "@ember/test-helpers";
|
|
import { test } from "qunit";
|
|
import I18n from "I18n";
|
|
|
|
acceptance("Admin - Themes - Install modal", function (needs) {
|
|
needs.user();
|
|
test("closing the modal resets the modal inputs", async function (assert) {
|
|
const urlInput = ".install-theme-content .repo input";
|
|
const branchInput = ".install-theme-content .branch input";
|
|
const publicKey = ".install-theme-content .public-key textarea";
|
|
|
|
const themeUrl = "git@github.com:discourse/discourse.git";
|
|
await visit("/admin/customize/themes");
|
|
|
|
await click(".create-actions .btn-primary");
|
|
await click("#remote");
|
|
await fillIn(urlInput, themeUrl);
|
|
await click(".install-theme-content .inputs .advanced-repo");
|
|
await fillIn(branchInput, "tests-passed");
|
|
assert.strictEqual(query(urlInput).value, themeUrl, "url input is filled");
|
|
assert.strictEqual(
|
|
query(branchInput).value,
|
|
"tests-passed",
|
|
"branch input is filled"
|
|
);
|
|
assert.ok(query(publicKey), "shows public key");
|
|
|
|
await click(".modal-footer .d-modal-cancel");
|
|
|
|
await click(".create-actions .btn-primary");
|
|
await click("#remote");
|
|
assert.strictEqual(query(urlInput).value, "", "url input is reset");
|
|
assert.strictEqual(query(branchInput).value, "", "branch input is reset");
|
|
assert.notOk(query(publicKey), "hide public key");
|
|
});
|
|
|
|
test("show public key for valid ssh theme urls", async function (assert) {
|
|
const urlInput = ".install-theme-content .repo input";
|
|
const publicKey = ".install-theme-content .public-key textarea";
|
|
|
|
// Supports backlog repo ssh url format
|
|
const themeUrl =
|
|
"discourse@discourse.git.backlog.com:/TEST_THEME/test-theme.git";
|
|
await visit("/admin/customize/themes");
|
|
|
|
await click(".create-actions .btn-primary");
|
|
await click("#remote");
|
|
await fillIn(urlInput, themeUrl);
|
|
await click(".install-theme-content .inputs .advanced-repo");
|
|
assert.strictEqual(query(urlInput).value, themeUrl, "url input is filled");
|
|
assert.ok(query(publicKey), "shows public key");
|
|
|
|
// Supports AWS CodeCommit style repo URLs
|
|
await fillIn(
|
|
urlInput,
|
|
"ssh://someID@git-codecommit.us-west-2.amazonaws.com/v1/repos/test-repo.git"
|
|
);
|
|
assert.ok(query(publicKey), "shows public key");
|
|
|
|
await fillIn(urlInput, "https://github.com/discourse/discourse.git");
|
|
assert.notOk(query(publicKey), "does not show public key for https urls");
|
|
|
|
await fillIn(urlInput, "git@github.com:discourse/discourse.git");
|
|
assert.ok(query(publicKey), "shows public key for valid github repo url");
|
|
|
|
await fillIn(urlInput, "git@github.com:discourse/discourse");
|
|
assert.ok(query(publicKey), "shows public key for valid github repo url");
|
|
|
|
await fillIn(urlInput, "git@github.com/discourse/discourse");
|
|
assert.notOk(
|
|
query(publicKey),
|
|
"does not shows public key for valid github repo url"
|
|
);
|
|
});
|
|
|
|
test("modal can be auto-opened with the right query params", async function (assert) {
|
|
await visit("/admin/customize/themes?repoUrl=testUrl&repoName=testName");
|
|
assert.ok(query(".admin-install-theme-modal"), "modal is visible");
|
|
assert.strictEqual(
|
|
query(".install-theme code").textContent.trim(),
|
|
"testUrl",
|
|
"repo url is visible"
|
|
);
|
|
|
|
await click(".d-modal-cancel");
|
|
assert.strictEqual(
|
|
currentURL(),
|
|
"/admin/customize/themes",
|
|
"query params are cleared after dismissing the modal"
|
|
);
|
|
});
|
|
|
|
test("installed themes are matched with the popular list by URL", async function (assert) {
|
|
await visit("/admin/customize/themes");
|
|
await click(".create-actions .btn-primary");
|
|
|
|
assert.notOk(
|
|
query(
|
|
'.popular-theme-item[data-name="Graceful"] .popular-theme-buttons button'
|
|
),
|
|
"no install button is shown for installed themes"
|
|
);
|
|
assert.strictEqual(
|
|
query(
|
|
'.popular-theme-item[data-name="Graceful"] .popular-theme-buttons'
|
|
).textContent.trim(),
|
|
I18n.t("admin.customize.theme.installed")
|
|
);
|
|
|
|
assert.ok(
|
|
query(
|
|
'.popular-theme-item[data-name="Minima"] .popular-theme-buttons button'
|
|
),
|
|
"install button is shown for not installed themes"
|
|
);
|
|
});
|
|
});
|