github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 08:42:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix the build.

Browse Source
This commit is contained in:
Guo Xiang Tan 2018-03-28 09:42:12 +08:00
parent 8bc5da57b0
commit baa383b7f1
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/components/group-form.hbs
View File

@ -181,7 +181,7 @@
<div class='control-group buttons'> <div class='control-group buttons'>
{{d-button action="save" {{d-button action="save"
disabled=disableSave disabled=disableSave
class='btn btn-primary' class='btn btn-primary group-form-save'
label=saveLabel}} label=saveLabel}}
{{yield}} {{yield}}

2
app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
View File

@ -12,7 +12,7 @@
{{d-button action="resetPassword" {{d-button action="resetPassword"
label="forgot_password.reset" label="forgot_password.reset"
disabled=submitDisabled disabled=submitDisabled
class="btn-primary"}} class="btn-primary forgot-password-reset"}}
{{else}} {{else}}
{{d-button class="btn-large btn-primary" {{d-button class="btn-large btn-primary"
label="forgot_password.button_ok" label="forgot_password.button_ok"

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

@ -25,14 +25,14 @@ QUnit.test("requesting password reset", assert => {
andThen(() => { andThen(() => {
assert.equal( assert.equal(
find('button[title="Reset Password"]').attr("disabled"), find('.forgot-password-reset').attr("disabled"),
"disabled", "disabled",
'it should disable the button until the field is filled' 'it should disable the button until the field is filled'
); );
}); });
fillIn("#username-or-email", 'someuser'); fillIn("#username-or-email", 'someuser');
click('button[title="Reset Password"]'); click('.forgot-password-reset');
andThen(() => { andThen(() => {
assert.equal( assert.equal(
@ -43,7 +43,7 @@ QUnit.test("requesting password reset", assert => {
}); });
fillIn("#username-or-email", 'someuser@gmail.com'); fillIn("#username-or-email", 'someuser@gmail.com');
click('button[title="Reset Password"]'); click('.forgot-password-reset');
andThen(() => { andThen(() => {
assert.equal( assert.equal(
@ -59,7 +59,7 @@ QUnit.test("requesting password reset", assert => {
userFound = true; userFound = true;
}); });
click('button[title="Reset Password"]'); click('.forgot-password-reset');
andThen(() => { andThen(() => {
assert.notOk(exists(find(".alert-error")), 'it should remove the flash error when succeeding'); assert.notOk(exists(find(".alert-error")), 'it should remove the flash error when succeeding');
@ -75,7 +75,7 @@ QUnit.test("requesting password reset", assert => {
click("header .login-button"); click("header .login-button");
click('#forgot-password-link'); click('#forgot-password-link');
fillIn("#username-or-email", 'someuser@gmail.com'); fillIn("#username-or-email", 'someuser@gmail.com');
click('button[title="Reset Password"]'); click('.forgot-password-reset');
andThen(() => { andThen(() => {
assert.equal( assert.equal(

2
test/javascripts/acceptance/groups-new-test.js.es6
View File

@ -29,7 +29,7 @@ QUnit.test("Creating a new group", assert => {
); );
assert.ok( assert.ok(
find("button[title='Create']:disabled").length === 1, find(".group-form-save:disabled").length === 1,
'it should disable the save button' 'it should disable the save button'
); );
}); });