Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DEV: Minor cleanup of create-account tests #14989

Merged
merged 2 commits into from
Nov 24, 2021
Merged

DEV: Minor cleanup of create-account tests #14989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6010f65
DEV: Minor cleanup of create-account tests
CvX Nov 17, 2021
49a56c3
avoid whoopsies
CvX Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/assets/javascripts/discourse/app/controllers/create-account.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,10 @@ export default Controller.extend(

this._hpPromise = ajax("/session/hp.json")
.then((json) => {
if (this.isDestroying || this.isDestroyed) {
return;
}

this._challengeDate = new Date();
// remove 30 seconds for jitter, make sure this works for at least
// 30 seconds so we don't have hard loops
Expand Down
21 changes: 10 additions & 11 deletions app/assets/javascripts/discourse/tests/unit/controllers/create-account-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { discourseModule } from "discourse/tests/helpers/qunit-helpers";
import { test } from "qunit";

discourseModule("Unit | Controller | create-account", function () {
test("basicUsernameValidation", async function (assert) {
const testInvalidUsername = async (username, expectedReason) => {
test("basicUsernameValidation", function (assert) {
const testInvalidUsername = (username, expectedReason) => {
const controller = this.getController("create-account");
controller.set("accountUsername", username);

Expand All @@ -24,8 +24,7 @@ discourseModule("Unit | Controller | create-account", function () {
I18n.t("user.username.too_long")
);

const controller = await this.owner.lookup("controller:create-account");
controller.setProperties({
const controller = this.getController("create-account", {
accountUsername: "porkchops",
prefilledUsername: "porkchops",
});
Expand All @@ -39,7 +38,7 @@ discourseModule("Unit | Controller | create-account", function () {
);
});

test("passwordValidation", async function (assert) {
test("passwordValidation", function (assert) {
const controller = this.getController("create-account");

controller.set("authProvider", "");
Expand All @@ -49,12 +48,12 @@ discourseModule("Unit | Controller | create-account", function () {
controller.set("accountPassword", "b4fcdae11f9167");

assert.strictEqual(
controller.get("passwordValidation.ok"),
controller.passwordValidation.ok,
true,
"Password is ok"
);
assert.strictEqual(
controller.get("passwordValidation.reason"),
controller.passwordValidation.reason,
I18n.t("user.password.ok"),
"Password is valid"
);
Expand All @@ -63,12 +62,12 @@ discourseModule("Unit | Controller | create-account", function () {
controller.set("accountPassword", password);

assert.strictEqual(
controller.get("passwordValidation.failed"),
controller.passwordValidation.failed,
true,
"password should be invalid: " + password
);
assert.strictEqual(
controller.get("passwordValidation.reason"),
controller.passwordValidation.reason,
expectedReason,
"password validation reason: " + password + ", " + expectedReason
);
Expand All @@ -83,8 +82,8 @@ discourseModule("Unit | Controller | create-account", function () {
);
});

test("authProviderDisplayName", async function (assert) {
const controller = this.owner.lookup("controller:create-account");
test("authProviderDisplayName", function (assert) {
const controller = this.getController("create-account");

assert.strictEqual(
controller.authProviderDisplayName("facebook"),
Expand Down