IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Login with email/forget password UI refactoring

Browse Source 
* move button into login modal with social buttons
* adds email link next to login field when filling it
* adds proper validation messages
* improves forgot password flash clearing
* more tests
This commit is contained in:
Joffrey JAFFEUX
2018-02-20 13:29:43 +01:00
committed by Guo Xiang Tan
parent 720e1965e3
commit 6f5acfe783
13 changed files with 277 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
test/javascripts/acceptance/forgot-password-test.js.es6
View File

@@ -3,9 +3,6 @@ import { acceptance } from "helpers/qunit-helpers";
let userFound = false;
acceptance("Forgot password", {
settings: {
enable_local_logins_via_email: true
},
beforeEach() {
const response = object => {
return [
@@ -15,41 +12,44 @@ acceptance("Forgot password", {
];
};
server.post('/u/email-login', () => { // eslint-disable-line no-undef
server.post('/session/forgot_password', () => { // eslint-disable-line no-undef
return response({ "user_found": userFound });
});
}
});
QUnit.test("logging in via email", assert => {
QUnit.test("requesting password reset", assert => {
visit("/");
click("header .login-button");
andThen(() => {
assert.ok(exists('.login-modal'), "it shows the login modal");
});
click('#forgot-password-link');
fillIn("#username-or-email", 'someuser');
click('.email-login');
andThen(() => {
assert.equal(
find(".alert-error").html(),
I18n.t('email_login.complete_username_not_found', { username: 'someuser' }),
'it should display the right error message'
find('button[title="Reset Password"]').attr("disabled"),
"disabled",
'it should disable the button until the field is filled'
);
});
fillIn("#username-or-email", 'someuser');
click('button[title="Reset Password"]');
andThen(() => {
assert.equal(
find(".alert-error").html().trim(),
I18n.t('forgot_password.complete_username_not_found', { username: 'someuser' }),
'it should display an error for an invalid username'
);
});
fillIn("#username-or-email", 'someuser@gmail.com');
click('.email-login');
click('button[title="Reset Password"]');
andThen(() => {
assert.equal(
find(".alert-error").html(),
I18n.t('email_login.complete_email_not_found', { email: 'someuser@gmail.com' }),
'it should display the right error message'
find(".alert-error").html().trim(),
I18n.t('forgot_password.complete_email_not_found', { email: 'someuser@gmail.com' }),
'it should display an error for an invalid email'
);
});
@@ -59,32 +59,29 @@ QUnit.test("logging in via email", assert => {
userFound = true;
});
click('.email-login');
click('button[title="Reset Password"]');
andThen(() => {
assert.notOk(exists(find(".alert-error")), 'it should remove the flash error when succeeding');
assert.equal(
find(".modal-body").html().trim(),
I18n.t('email_login.complete_username_found', { username: 'someuser' }),
'it should display the right message'
I18n.t('forgot_password.complete_username_found', { username: 'someuser' }),
'it should display a success message for a valid username'
);
});
visit("/");
click("header .login-button");
andThen(() => {
assert.ok(exists('.login-modal'), "it shows the login modal");
});
click('#forgot-password-link');
fillIn("#username-or-email", 'someuser@gmail.com');
click('.email-login');
click('button[title="Reset Password"]');
andThen(() => {
assert.equal(
find(".modal-body").html().trim(),
I18n.t('email_login.complete_email_found', { email: 'someuser@gmail.com' }),
'it should display the right message'
I18n.t('forgot_password.complete_email_found', { email: 'someuser@gmail.com' }),
'it should display a success message for a valid email'
);
});
});

116
test/javascripts/acceptance/login-with-email-test.js.es6 Normal file
View File

@@ -0,0 +1,116 @@
import { acceptance } from "helpers/qunit-helpers";
let userFound = false;
acceptance("Login with email", {
settings: {
enable_local_logins_via_email: true,
enable_facebook_logins: true
},
beforeEach() {
const response = object => {
return [
200,
{ "Content-Type": "application/json" },
object
];
};
server.post('/u/email-login', () => { // eslint-disable-line no-undef
return response({ "user_found": userFound });
});
}
});
QUnit.test("logging in via email (link)", assert => {
visit("/");
click("header .login-button");
andThen(() => {
assert.notOk(exists(".login-with-email-link"), 'it displays the link only when field is filled');
});
fillIn("#login-account-name", "someuser");
click(".login-with-email-link");
andThen(() => {
assert.equal(
find(".alert-error").html(),
I18n.t('email_login.complete_username_not_found', { username: 'someuser' }),
'it should display an error for an invalid username'
);
});
fillIn("#login-account-name", 'someuser@gmail.com');
click('.login-with-email-link');
andThen(() => {
assert.equal(
find(".alert-error").html(),
I18n.t('email_login.complete_email_not_found', { email: 'someuser@gmail.com' }),
'it should display an error for an invalid email'
);
});
fillIn("#login-account-name", 'someuser');
andThen(() => {
userFound = true;
});
click('.login-with-email-link');
andThen(() => {
assert.equal(
find(".alert-success").html().trim(),
I18n.t('email_login.complete_username_found', { username: 'someuser' }),
'it should display a success message for a valid username'
);
});
visit("/");
click("header .login-button");
fillIn("#login-account-name", 'someuser@gmail.com');
click('.login-with-email-link');
andThen(() => {
assert.equal(
find(".alert-success").html().trim(),
I18n.t('email_login.complete_email_found', { email: 'someuser@gmail.com' }),
'it should display a success message for a valid email'
);
});
andThen(() => {
userFound = false;
});
});
QUnit.test("logging in via email (button)", assert => {
visit("/");
click("header .login-button");
click('.login-with-email-button');
andThen(() => {
assert.equal(
find(".alert-error").html(),
I18n.t('login.blank_username'),
'it should display an error for blank username'
);
});
andThen(() => {
userFound = true;
});
fillIn("#login-account-name", 'someuser');
click('.login-with-email-button');
andThen(() => {
assert.equal(
find(".alert-success").html().trim(),
I18n.t('email_login.complete_username_found', { username: 'someuser' }),
'it should display a success message for a valid username'
);
});
});