From 383d61e08a26b80882d7d079a8bba7f9758d2b7f Mon Sep 17 00:00:00 2001
From: attiyaishaque <atiya.ishaq@arbisoft.com>
Date: Thu, 1 Jun 2017 15:17:24 +0500
Subject: [PATCH] EDUCATOR-496 Display date in correct UTC format.

---
 .../support/js/spec/views/enrollment_spec.js    | 17 +++++++++++++++++
 .../js/spec_helpers/enrollment_helpers.js       |  2 +-
 .../static/support/js/views/enrollment.js       |  7 +------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/support/static/support/js/spec/views/enrollment_spec.js b/lms/djangoapps/support/static/support/js/spec/views/enrollment_spec.js
index e7ab1425b9..83e52d01be 100644
--- a/lms/djangoapps/support/static/support/js/spec/views/enrollment_spec.js
+++ b/lms/djangoapps/support/static/support/js/spec/views/enrollment_spec.js
@@ -58,5 +58,22 @@ define([
             enrollmentView.$('.change-enrollment-btn').first().click();
             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
+        });
+
     });
 });
diff --git a/lms/djangoapps/support/static/support/js/spec_helpers/enrollment_helpers.js b/lms/djangoapps/support/static/support/js/spec_helpers/enrollment_helpers.js
index d07faa1cdb..fc692508b9 100644
--- a/lms/djangoapps/support/static/support/js/spec_helpers/enrollment_helpers.js
+++ b/lms/djangoapps/support/static/support/js/spec_helpers/enrollment_helpers.js
@@ -39,7 +39,7 @@ define([], function() {
             enrollment_end: null,
             verified_price: 5,
             verified_upgrade_deadline: null,
-            verification_deadline: null,
+            verification_deadline: '2017-09-01T16:00:00Z',
             manual_enrollment: {}
         }
     };
diff --git a/lms/djangoapps/support/static/support/js/views/enrollment.js b/lms/djangoapps/support/static/support/js/views/enrollment.js
index 127c00faab..4549c2c3a5 100644
--- a/lms/djangoapps/support/static/support/js/views/enrollment.js
+++ b/lms/djangoapps/support/static/support/js/views/enrollment.js
@@ -39,12 +39,7 @@
                     user: user,
                     enrollments: this.enrollments,
                     formatDate: function(date) {
-                        if (!date) {
-                            return 'N/A';
-                        }
-                        else {
-                            return moment(date).format('MM/DD/YYYY (H:MM UTC)');
-                        }
+                        return date ? moment.utc(date).format('lll z') : 'N/A';
                     }
                 }));