codeninjasllc/discourse
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix build

Browse source
This commit is contained in:
Régis Hanol 2016-03-04 10:52:23 +01:00
parent 06ec563883
commit 71911a4c67
2 changed files with 5 additions and 5 deletions
app/assets/javascripts/discourse/controllers
create-account.js.es6
test/javascripts/controllers
create-account-test.js.es6

4
app/assets/javascripts/discourse/controllers/create-account.js.es6
View file

@ -72,7 +72,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
}.property('authOptions.auth_provider'), }.property('authOptions.auth_provider'),
passwordInstructions: function() { passwordInstructions: function() {
return this.get('isDeveloper') ? I18n.t('user.password.instructions', {count: this.siteSettings.min_admin_password_length}) : I18n.t('user.password.instructions', {count: this.siteSettings.min_password_length}); return this.get('isDeveloper') ? I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_admin_password_length}) : I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_password_length});
}.property('isDeveloper'), }.property('isDeveloper'),
nameInstructions: function() { nameInstructions: function() {
@ -285,7 +285,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
} }
// If too short // If too short
const passwordLength = this.get('isDeveloper') ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length; const passwordLength = this.get('isDeveloper') ? Discourse.SiteSettings.min_admin_password_length : Discourse.SiteSettings.min_password_length;
if (password.length < passwordLength) { if (password.length < passwordLength) {
return Discourse.InputValidation.create({ return Discourse.InputValidation.create({
failed: true, failed: true,

6
test/javascripts/controllers/create-account-test.js.es6
View file

@ -28,11 +28,11 @@ test('passwordValidation', function() {
var controller = subject(); var controller = subject();
controller.set('passwordRequired', true); controller.set('passwordRequired', true);
controller.set('accountEmail', 'pork@chops.com'); controller.set('accountEmail', 'pork@chops.com');
controller.set('accountUsername', 'porkchops'); controller.set('accountUsername', 'porkchops');
controller.set('prefilledUsername', 'porkchops'); controller.set('prefilledUsername', 'porkchops');
controller.set('accountPassword', 'b4fcdae11f9167'); controller.set('accountPassword', 'b4fcdae11f9167');
equal(controller.get('passwordValidation.ok'), true, 'Password is ok'); equal(controller.get('passwordValidation.ok'), true, 'Password is ok');
equal(controller.get('passwordValidation.reason'), I18n.t('user.password.ok'), 'Password is valid'); equal(controller.get('passwordValidation.reason'), I18n.t('user.password.ok'), 'Password is valid');