Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix failing JS tests

Browse Source
This commit is contained in:
Renzo Lucioni
2014-10-27 13:29:30 -04:00
committed by AlasdairSwan
parent 0b9ed0315b
commit ca0d048b4f
2 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lms/static/js/spec/main.js
View File

@@ -263,13 +263,20 @@
// Student account registration/login
// Loaded explicitly until these are converted to RequireJS
'js/student_account/views/FormView': {
exports: 'js/student_account/views/FormView',
deps: ['jquery', 'underscore', 'backbone', 'gettext']
},
'js/student_account/models/LoginModel': {
exports: 'js/student_account/models/LoginModel',
deps: ['jquery', 'underscore', 'backbone', 'gettext', 'jquery.cookie']
},
'js/student_account/views/LoginView': {
exports: 'js/student_account/views/LoginView',
deps: ['js/student_account/models/LoginModel']
deps: [
'js/student_account/models/LoginModel',
'js/student_account/views/FormView'
]
},
'js/student_account/models/PasswordResetModel': {
exports: 'js/student_account/models/PasswordResetModel',
@@ -277,7 +284,10 @@
},
'js/student_account/views/PasswordResetView': {
exports: 'js/student_account/views/PasswordResetView',
deps: ['js/student_account/models/PasswordResetModel']
deps: [
'js/student_account/models/PasswordResetModel',
'js/student_account/views/FormView'
]
},
'js/student_account/models/RegisterModel': {
exports: 'js/student_account/models/RegisterModel',
@@ -285,7 +295,10 @@
},
'js/student_account/views/RegisterView': {
exports: 'js/student_account/views/RegisterView',
deps: ['js/student_account/models/RegisterModel']
deps: [
'js/student_account/models/RegisterModel',
'js/student_account/views/FormView'
]
},
'js/student_account/views/AccessView': {
exports: 'js/student_account/views/AccessView',

30
lms/static/js/spec/student_account/password_reset_spec.js
View File

@@ -4,11 +4,21 @@ define(['js/common_helpers/template_helpers', 'js/student_account/views/Password
'use strict';
var view = null,
ajaxSuccess = true;
ajaxSuccess = true,
model = new edx.student.account.PasswordResetModel(),
data = [{
label: 'E-mail',
instructions: 'This is the e-mail address you used to register with edX',
name: 'email',
required: true,
type: 'email',
restrictions: [],
defaultValue: ''
}];
var submitEmail = function(validationSuccess) {
// Simulate manual entry of an email address
$('#reset-password-email').val('foo@bar.baz');
$('#password-reset-email').val('foo@bar.baz');
// Create a fake click event
var clickEvent = $.Event('click');
@@ -16,7 +26,10 @@ define(['js/common_helpers/template_helpers', 'js/student_account/views/Password
// Used to avoid spying on view.validate twice
if (typeof validationSuccess !== 'undefined') {
// Force validation to return as expected
spyOn(view, 'validate').andReturn(validationSuccess);
spyOn(view, 'validate').andReturn({
isValid: validationSuccess,
message: "We're all good."
});
}
// Submit the email address
@@ -43,12 +56,15 @@ define(['js/common_helpers/template_helpers', 'js/student_account/views/Password
if (ajaxSuccess) {
defer.resolve();
} else {
defer.reject();
defer.rejectWith(this, ["The server could not be contacted."]);
}
}).promise();
});
view = new edx.student.account.PasswordResetView();
view = new edx.student.account.PasswordResetView({
fields: data,
model: model
});
});
it("allows the user to request a new password", function() {
@@ -72,13 +88,13 @@ define(['js/common_helpers/template_helpers', 'js/student_account/views/Password
// If we get an error status on the AJAX request, display an error
ajaxSuccess = false;
submitEmail(true);
expect(view.$resetFail).not.toHaveClass('hidden');
expect(view.$'#submission-error').not.toHaveClass('hidden');
// If we try again and succeed, the error should go away
ajaxSuccess = true;
// No argument means we won't spy on view.validate again
submitEmail();
expect(view.$resetFail).toHaveClass('hidden');
expect(view.$'#submission-error').toHaveClass('hidden');
});
});
}