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

Merge pull request #13013 from edx/mushtaq/ecom4926-unactivated-user-msg

Browse Source 
Show user activation message if he has activation incomplete.
This commit is contained in:
Mushtaq Ali
2016-07-21 11:33:32 +05:00
committed by GitHub
parent 893d1f5dfe e58813be79
commit d4f359d42a
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lms/static/js/spec/verify_student/make_payment_step_view_spec.js
View File

@@ -142,6 +142,41 @@ define([
expectPaymentSubmitted( view, {foo: 'bar'} );
});
it ('view containing verification msg when verification deadline is set and user is active', function() {
var verificationDeadlineDateFormat = 'Aug 14, 2016 at 23:59 UTC';
createView({
userEmail: 'test@example.com',
requirements: {
isVisible:true
},
verificationDeadline: verificationDeadlineDateFormat,
isActive: true
});
// Verify user does not get user activation message when he is already activated.
expect($('p.instruction-info:contains("test@example.com")').length).toEqual(0);
// Verify user gets verification message.
expect(
$(
'p.instruction-info:contains("You can pay now even if you don\'t have ' +
'the following items available, but you will need to have these by ' +
verificationDeadlineDateFormat + ' to qualify to earn a Verified Certificate.")'
).length
).toEqual(1);
});
it ('view containing user email when verification deadline is set and user is not active', function() {
createView({
userEmail: 'test@example.com',
requirements: {
isVisible:true
},
verificationDeadline: true,
isActive: false
});
// Verify un-activated user gets activation message.
expect($('p.instruction-info:contains("test@example.com")').length).toEqual(1);
});
it ('view containing user email', function() {
createView({userEmail: 'test@example.com', requirements: {isVisible:true}, isActive: false});
expect($('p.instruction-info:contains("test@example.com")').length).toEqual(1);

2
lms/templates/verify_student/make_payment_step.underscore
View File

@@ -30,7 +30,7 @@
<div class="instruction <% if ( !upgrade && isActive ) { %>center-col<% } %>">
<% if ( _.some( requirements, function( isVisible ) { return isVisible; } ) ) { %>
<p class="instruction-info">
<% if ( verificationDeadline ) { %>
<% if ( verificationDeadline && isActive) { %>
<%- _.sprintf(
gettext( "You can pay now even if you don't have the following items available, but you will need to have these by %(date)s to qualify to earn a Verified Certificate." ),
{ date: verificationDeadline }