From ec1cbdf5137460487f0feb3ea28da50eb0f92ccf Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Fri, 29 Jul 2016 14:07:08 -0400 Subject: [PATCH 1/2] test that passing unicode to a youtube id does not throw an error (TNL-5127) --- common/lib/xmodule/xmodule/tests/test_video.py | 11 +++++++++++ .../lib/xmodule/xmodule/video_module/video_module.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/common/lib/xmodule/xmodule/tests/test_video.py b/common/lib/xmodule/xmodule/tests/test_video.py index 12c4042c87..51cc6094c7 100644 --- a/common/lib/xmodule/xmodule/tests/test_video.py +++ b/common/lib/xmodule/xmodule/tests/test_video.py @@ -233,6 +233,17 @@ class TestCreateYoutubeString(VideoDescriptorTestBase): expected = "0.75:izygArpw-Qo,1.00:p2Q6BrNhdh8,1.25:1EeWXzPdhSA" self.assertEqual(create_youtube_string(self.descriptor), expected) +class TestCreateYouTubeUrl(VideoDescriptorTestBase): + """ + Tests for helper method `create_youtube_url`. + """ + def test_create_youtube_url_unicode(self): + """ + Test that passing unicode to `create_youtube_url` doesn't throw + an error. + """ + self.descriptor.create_youtube_url(u"üñîçø∂é") + @ddt.ddt class VideoDescriptorImportTestCase(unittest.TestCase): diff --git a/common/lib/xmodule/xmodule/video_module/video_module.py b/common/lib/xmodule/xmodule/video_module/video_module.py index c4143506c1..780ce6dce5 100644 --- a/common/lib/xmodule/xmodule/video_module/video_module.py +++ b/common/lib/xmodule/xmodule/video_module/video_module.py @@ -619,9 +619,9 @@ class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandler A full youtube url to the video whose ID is passed in """ if youtube_id: - return 'https://www.youtube.com/watch?v={0}'.format(youtube_id) + return u'https://www.youtube.com/watch?v={0}'.format(youtube_id) else: - return '' + return u'' def get_context(self): """ From 74ab4ad9c86a96b2adb368a10911bc76ca2129ea Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Fri, 29 Jul 2016 15:28:02 -0400 Subject: [PATCH 2/2] fix quality failure --- common/lib/xmodule/xmodule/tests/test_video.py | 1 + 1 file changed, 1 insertion(+) diff --git a/common/lib/xmodule/xmodule/tests/test_video.py b/common/lib/xmodule/xmodule/tests/test_video.py index 51cc6094c7..42328114ca 100644 --- a/common/lib/xmodule/xmodule/tests/test_video.py +++ b/common/lib/xmodule/xmodule/tests/test_video.py @@ -233,6 +233,7 @@ class TestCreateYoutubeString(VideoDescriptorTestBase): expected = "0.75:izygArpw-Qo,1.00:p2Q6BrNhdh8,1.25:1EeWXzPdhSA" self.assertEqual(create_youtube_string(self.descriptor), expected) + class TestCreateYouTubeUrl(VideoDescriptorTestBase): """ Tests for helper method `create_youtube_url`.