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
31802a66
Commit
31802a66
authored
Jun 01, 2015
by
Alessandro Verdura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PR feedback
TNL-925
parent
6d9cfdcd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
14 deletions
+5
-14
cms/static/sass/views/_import.scss
+1
-1
common/test/acceptance/tests/studio/test_import_export.py
+4
-13
No files found.
cms/static/sass/views/_import.scss
View file @
31802a66
...
...
@@ -187,8 +187,8 @@
&
.item-progresspoint-success
{
.item-progresspoint-success-date
{
@include
margin-left
(
$baseline
/
4
);
display
:
none
;
margin-left
:
5px
;
}
&
.is-complete
{
...
...
common/test/acceptance/tests/studio/test_import_export.py
View file @
31802a66
...
...
@@ -184,11 +184,13 @@ class ImportTestMixin(object):
self
.
import_page
.
upload_tarball
(
self
.
tarball_name
)
self
.
import_page
.
wait_for_upload
()
def
test_import_timestamp
_value
(
self
):
def
test_import_timestamp
(
self
):
"""
Scenario: I perform a course / library import
On import success, the page displays a UTC timestamp
On import success, the page displays a UTC timestamp previously not visible
And if I refresh the page, the timestamp is still displayed
"""
self
.
assertFalse
(
self
.
import_page
.
is_timestamp_visible
())
self
.
import_page
.
upload_tarball
(
self
.
tarball_name
)
self
.
import_page
.
wait_for_upload
()
...
...
@@ -199,17 +201,6 @@ class ImportTestMixin(object):
self
.
assertEqual
(
utc_now
.
strftime
(
'
%
m/
%
d/
%
Y'
),
import_date
)
self
.
assertEqual
(
utc_now
.
strftime
(
'
%
H:
%
M'
),
import_time
)
def
test_import_timestamp_visibility
(
self
):
"""
Scenario: I perform a course / library import
On import success, the page displays a timestamp previously not visible
And if I refresh the page, the timestamp is still displayed
"""
self
.
assertFalse
(
self
.
import_page
.
is_timestamp_visible
())
self
.
import_page
.
upload_tarball
(
self
.
tarball_name
)
self
.
import_page
.
wait_for_upload
()
self
.
assertTrue
(
self
.
import_page
.
is_timestamp_visible
())
self
.
import_page
.
visit
()
self
.
import_page
.
wait_for_tasks
(
completed
=
True
)
self
.
assertTrue
(
self
.
import_page
.
is_timestamp_visible
())
...
...
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