Commit 383d61e0 by attiyaishaque

EDUCATOR-496 Display date in correct UTC format.

parent 6a244a3f
...@@ -58,5 +58,22 @@ define([ ...@@ -58,5 +58,22 @@ define([
enrollmentView.$('.change-enrollment-btn').first().click(); enrollmentView.$('.change-enrollment-btn').first().click();
expect($('.enrollment-modal').length).toBe(1); expect($('.enrollment-modal').length).toBe(1);
}); });
it('renders correct datetime format in UTC', function() {
var $enrollmentResultRow,
requests = AjaxHelpers.requests(this);
enrollmentView = createEnrollmentView().render();
AjaxHelpers.expectRequest(requests, 'GET', '/support/enrollment/test-user', null);
AjaxHelpers.respondWithJson(requests, [EnrollmentHelpers.mockEnrollmentData]);
expect($('.enrollment-results').length).toBe(1);
expect($('.enrollment-search input').val()).toBe('test-user');
$enrollmentResultRow = $('.enrollment-results tbody tr');
expect($enrollmentResultRow.find('td:nth-child(2)').text())
.toBe('Jan 1, 2015 12:00 AM UTC'); // course Start Date
expect($enrollmentResultRow.find('td:nth-child(3)').text())
.toBe('Jan 1, 2017 12:00 AM UTC'); // course End date
expect($enrollmentResultRow.find('td:nth-child(5)').text())
.toBe('Sep 1, 2017 4:00 PM UTC'); // Verification Deadline
});
}); });
}); });
...@@ -39,7 +39,7 @@ define([], function() { ...@@ -39,7 +39,7 @@ define([], function() {
enrollment_end: null, enrollment_end: null,
verified_price: 5, verified_price: 5,
verified_upgrade_deadline: null, verified_upgrade_deadline: null,
verification_deadline: null, verification_deadline: '2017-09-01T16:00:00Z',
manual_enrollment: {} manual_enrollment: {}
} }
}; };
......
...@@ -39,12 +39,7 @@ ...@@ -39,12 +39,7 @@
user: user, user: user,
enrollments: this.enrollments, enrollments: this.enrollments,
formatDate: function(date) { formatDate: function(date) {
if (!date) { return date ? moment.utc(date).format('lll z') : 'N/A';
return 'N/A';
}
else {
return moment(date).format('MM/DD/YYYY (H:MM UTC)');
}
} }
})); }));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment