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
c9afa056
Commit
c9afa056
authored
Jun 13, 2014
by
Alexander Kryklia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move video descriptor instantiation in tests to single place.
parent
54399533
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
14 deletions
+6
-14
common/lib/xmodule/xmodule/tests/test_video.py
+0
-0
lms/djangoapps/courseware/tests/test_video_mongo.py
+6
-14
No files found.
common/lib/xmodule/xmodule/tests/test_video.py
View file @
c9afa056
This diff is collapsed.
Click to expand it.
lms/djangoapps/courseware/tests/test_video_mongo.py
View file @
c9afa056
...
...
@@ -10,11 +10,11 @@ from django.conf import settings
from
xblock.fields
import
ScopeIds
from
xblock.field_data
import
DictFieldData
from
xmodule.video_module
import
create_youtube_string
from
xmodule.tests
import
get_test_descriptor_system
from
xmodule.video_module
import
VideoDescriptor
from
xmodule.video_module
import
create_youtube_string
,
VideoDescriptor
from
xmodule.x_module
import
STUDENT_VIEW
from
opaque_keys.edx.locations
import
SlashSeparatedCourseKey
from
xmodule.tests
import
get_test_descriptor_system
from
xmodule.tests.test_video
import
VideoDescriptorTestBase
from
.
import
BaseTestXmodule
from
.test_video_xml
import
SOURCE_XML
...
...
@@ -494,20 +494,12 @@ class TestVideoDescriptorInitialization(BaseTestXmodule):
self
.
assertFalse
(
self
.
item_descriptor
.
download_video
)
class
VideoDescriptorTest
(
unittest
.
TestC
ase
):
class
VideoDescriptorTest
(
VideoDescriptorTestB
ase
):
"""
Tests for video descriptor that requires access to django settings.
"""
def
setUp
(
self
):
system
=
get_test_descriptor_system
()
course_key
=
SlashSeparatedCourseKey
(
'org'
,
'course'
,
'run'
)
usage_key
=
course_key
.
make_usage_key
(
'video'
,
'name'
)
self
.
descriptor
=
system
.
construct_xblock_from_class
(
VideoDescriptor
,
scope_ids
=
ScopeIds
(
None
,
None
,
usage_key
,
usage_key
),
field_data
=
DictFieldData
({}),
)
super
(
VideoDescriptorTest
,
self
)
.
setUp
()
self
.
descriptor
.
runtime
.
handler_url
=
MagicMock
()
def
test_get_context
(
self
):
...
...
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