Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
383d61e0
Commit
383d61e0
authored
Jun 01, 2017
by
attiyaishaque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EDUCATOR-496 Display date in correct UTC format.
parent
6a244a3f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
7 deletions
+19
-7
lms/djangoapps/support/static/support/js/spec/views/enrollment_spec.js
+17
-0
lms/djangoapps/support/static/support/js/spec_helpers/enrollment_helpers.js
+1
-1
lms/djangoapps/support/static/support/js/views/enrollment.js
+1
-6
No files found.
lms/djangoapps/support/static/support/js/spec/views/enrollment_spec.js
View file @
383d61e0
...
@@ -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
});
});
});
});
});
lms/djangoapps/support/static/support/js/spec_helpers/enrollment_helpers.js
View file @
383d61e0
...
@@ -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
:
{}
}
}
};
};
...
...
lms/djangoapps/support/static/support/js/views/enrollment.js
View file @
383d61e0
...
@@ -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)'
);
}
}
}
}));
}));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment