Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update XML in old video tests. This change tags like <video youtube="1.0:abcdefg"> to <video youtube_id_1_0="abcdefg".

Browse Source
This commit is contained in:
Peter Fogg
2013-06-13 11:43:51 -04:00
parent 66ab6597ca
commit ef56c49056
16 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/lib/xmodule/xmodule/tests/test_import.py
View File

@@ -323,8 +323,8 @@ class ImportTestCase(BaseCourseTestCase):
location = Location(["i4x", "edX", "toy", "video", "Welcome"])
toy_video = modulestore.get_instance(toy_id, location)
two_toy_video = modulestore.get_instance(two_toy_id, location)
self.assertEqual(etree.fromstring(toy_video.data).get('youtube'), "1.0:p2Q6BrNhdh8")
self.assertEqual(etree.fromstring(two_toy_video.data).get('youtube'), "1.0:p2Q6BrNhdh9")
self.assertEqual(toy_video.youtube_id_1_0, "p2Q6BrNhdh8")
self.assertEqual(two_toy_video.youtube_id_1_0, "p2Q6BrNhdh9")
def test_colon_in_url_name(self):
"""Ensure that colons in url_names convert to file paths properly"""

10
common/lib/xmodule/xmodule/video_module.py
View File

@@ -90,12 +90,12 @@ class VideoDescriptor(VideoFields,
stores_state = True
template_dir_name = "video"
metadata_attributes = RawDescriptor.metadata_attributes + ('youtube_id_1_0',
'youtube_id_0_75',
'youtube_id_1_25',
'youtube_id_1_5')
# metadata_attributes = RawDescriptor.metadata_attributes + ('youtube_id_1_0',
# 'youtube_id_0_75',
# 'youtube_id_1_25',
# 'youtube_id_1_5')
metadata_to_strip = RawDescriptor.metadata_to_strip + ('show_captions',)
# metadata_to_strip = RawDescriptor.metadata_to_strip + ('show_captions',)
@property
def non_editable_metadata_fields(self):