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

fix: remove check for default values for video component when exporting.

Browse Source
This commit is contained in:
SaadYousaf
2022-01-20 17:38:10 +05:00
committed by Saad Yousaf
parent be2a57902f
commit 739083e301
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/lib/xmodule/xmodule/tests/test_video.py
View File

@@ -744,7 +744,7 @@ class VideoExportTestCase(VideoBlockTestBase):
xml = self.descriptor.definition_to_xml(self.file_system)
parser = etree.XMLParser(remove_blank_text=True)
xml_string = '<video url_name="SampleProblem"/>'
xml_string = '<video youtube="1.00:3_yD_cEKoCk" url_name="SampleProblem"/>'
expected = etree.XML(xml_string, parser=parser)
self.assertXmlEqual(expected, xml)
@@ -784,7 +784,7 @@ class VideoExportTestCase(VideoBlockTestBase):
"""
xml = self.descriptor.definition_to_xml(self.file_system)
# Check that download_video field is also set to default (False) in xml for backward compatibility
expected = '<video url_name="SampleProblem"/>\n'
expected = '<video youtube="1.00:3_yD_cEKoCk" url_name="SampleProblem"/>\n'
assert expected == etree.tostring(xml, pretty_print=True).decode('utf-8')
@patch('xmodule.video_module.video_module.edxval_api', None)
@@ -794,7 +794,7 @@ class VideoExportTestCase(VideoBlockTestBase):
"""
self.descriptor.transcripts = None
xml = self.descriptor.definition_to_xml(self.file_system)
expected = b'<video url_name="SampleProblem"/>\n'
expected = b'<video youtube="1.00:3_yD_cEKoCk" url_name="SampleProblem"/>\n'
assert expected == etree.tostring(xml, pretty_print=True)
@patch('xmodule.video_module.video_module.edxval_api', None)

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

@@ -673,9 +673,7 @@ class VideoBlock(
"""
xml = etree.Element('video')
youtube_string = create_youtube_string(self)
# Mild workaround to ensure that tests pass -- if a field
# is set to its default value, we don't need to write it out.
if youtube_string and youtube_string != '1.00:3_yD_cEKoCk':
if youtube_string:
xml.set('youtube', str(youtube_string))
xml.set('url_name', self.url_name)
attrs = [

6
lms/djangoapps/courseware/tests/test_video_mongo.py
View File

@@ -1671,7 +1671,7 @@ class VideoBlockTest(TestCase, VideoBlockTestBase):
actual = self.descriptor.definition_to_xml(resource_fs=self.file_system)
expected_str = """
<video url_name="SampleProblem" transcripts='{transcripts}'>
<video youtube="1.00:3_yD_cEKoCk" url_name="SampleProblem" transcripts='{transcripts}'>
<video_asset client_video_id="test_client_video_id" duration="111.0" image="">
<encoded_video profile="mobile" url="http://example.com/video" file_size="222" bitrate="333"/>
<transcripts>
@@ -1765,7 +1765,7 @@ class VideoBlockTest(TestCase, VideoBlockTestBase):
"""
self.descriptor.edx_video_id = 'nonexistent'
actual = self.descriptor.definition_to_xml(resource_fs=self.file_system)
expected_str = """<video url_name="SampleProblem"/>"""
expected_str = """<video youtube="1.00:3_yD_cEKoCk" url_name="SampleProblem"/>"""
parser = etree.XMLParser(remove_blank_text=True)
expected = etree.XML(expected_str, parser=parser)
self.assertXmlEqual(expected, actual)
@@ -1778,7 +1778,7 @@ class VideoBlockTest(TestCase, VideoBlockTestBase):
mock_get_video_ids_info.return_value = True, []
actual = self.descriptor.definition_to_xml(resource_fs=self.file_system)
expected_str = '<video url_name="SampleProblem"></video>'
expected_str = '<video youtube="1.00:3_yD_cEKoCk" url_name="SampleProblem"></video>'
parser = etree.XMLParser(remove_blank_text=True)
expected = etree.XML(expected_str, parser=parser)