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
920fc0e7
Commit
920fc0e7
authored
Dec 15, 2015
by
Syed Hasan raza
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10506 from edx/shr/bug/TNL-2622-course_import_status_message
set path explicitly for storing cookie
parents
bc654887
36db0635
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
1 deletions
+35
-1
cms/static/js/views/import.js
+1
-1
common/test/acceptance/tests/studio/base_studio_test.py
+6
-0
common/test/acceptance/tests/studio/test_import_export.py
+28
-0
No files found.
cms/static/js/views/import.js
View file @
920fc0e7
...
...
@@ -98,7 +98,7 @@ define(
file
:
file
,
date
:
moment
().
valueOf
(),
completed
:
completed
||
false
}));
})
,
{
path
:
window
.
location
.
pathname
}
);
};
/**
...
...
common/test/acceptance/tests/studio/base_studio_test.py
View file @
920fc0e7
...
...
@@ -20,6 +20,12 @@ class StudioCourseTest(UniqueCourseTest):
Install a course with no content using a fixture.
"""
super
(
StudioCourseTest
,
self
)
.
setUp
()
self
.
install_course_fixture
(
is_staff
)
def
install_course_fixture
(
self
,
is_staff
=
False
):
"""
Install a course fixture
"""
self
.
course_fixture
=
CourseFixture
(
self
.
course_info
[
'org'
],
self
.
course_info
[
'number'
],
...
...
common/test/acceptance/tests/studio/test_import_export.py
View file @
920fc0e7
...
...
@@ -364,6 +364,34 @@ class TestCourseImport(ImportTestMixin, StudioCourseTest):
"""
self
.
assertEqual
(
self
.
import_page
.
header_text
,
'Course Import'
)
def
test_multiple_course_import_message
(
self
):
"""
Given that I visit an empty course before import
When I visit the import page
And I upload a course with file name 2015.lzdwNM.tar.gz
Then timestamp is visible after course is updated successfully
And then I create a new course
When I visit the import page of this new course
Then timestamp is not visible
"""
self
.
import_page
.
visit
()
self
.
import_page
.
upload_tarball
(
self
.
tarball_name
)
self
.
import_page
.
wait_for_upload
()
self
.
assertTrue
(
self
.
import_page
.
is_timestamp_visible
())
# Create a new course and visit the import page
self
.
course_info
=
{
'org'
:
'test_org_2'
,
'number'
:
self
.
unique_id
+
'_2'
,
'run'
:
'test_run_2'
,
'display_name'
:
'Test Course 2'
+
self
.
unique_id
}
self
.
install_course_fixture
()
self
.
import_page
=
self
.
import_page_class
(
*
self
.
page_args
())
self
.
import_page
.
visit
()
# As this is new course which is never import so timestamp should not present
self
.
assertFalse
(
self
.
import_page
.
is_timestamp_visible
())
@attr
(
'shard_4'
)
class
TestLibraryImport
(
ImportTestMixin
,
StudioLibraryTest
):
...
...
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