Merge pull request #15573 from edx/release-mergeback-to-master

Merge release back to master
This commit is contained in:
edx-pipeline-bot
2017-07-14 12:56:04 -04:00
committed by GitHub
2 changed files with 22 additions and 5 deletions

View File

@@ -934,6 +934,19 @@ class TestGetHtmlMethod(BaseTestXmodule):
self.assertIn('"poster": "/media/video-images/poster.png"', context)
@patch('xmodule.video_module.video_module.edxval_api.get_course_video_image_url')
def test_poster_image_without_edx_video_id(self, get_course_video_image_url):
"""
Verify that poster image is set to None and there is no crash when no edx_video_id.
"""
video_xml = '<video display_name="Video" download_video="true" edx_video_id="null">[]</video>'
get_course_video_image_url.return_value = '/media/video-images/poster.png'
self.initialize_module(data=video_xml)
context = self.item_descriptor.render(STUDENT_VIEW).content
self.assertIn("\'poster\': \'null\'", context)
@attr(shard=1)
class TestVideoCDNRewriting(BaseTestXmodule):