diff --git a/cms/djangoapps/contentstore/features/video-editor.py b/cms/djangoapps/contentstore/features/video-editor.py index 6113f42c91..b74f37bb85 100644 --- a/cms/djangoapps/contentstore/features/video-editor.py +++ b/cms/djangoapps/contentstore/features/video-editor.py @@ -22,3 +22,17 @@ def set_show_captions(step, setting): world.wait_for(lambda _driver: world.css_visible('a.save-button')) world.browser.select('Show Captions', setting) world.css_click('a.save-button') + + +@step('I see the correct videoalpha settings and default values$') +def correct_videoalpha_settings(_step): + world.verify_all_setting_entries([['Display Name', 'Video Alpha', False], + ['Download Track', '', False], + ['Download Video', '', False], + ['HTML5 Subtitles', '', False], + ['Show Captions', 'True', False], + ['Video Sources', '', False], + ['Youtube ID', 'OEoXaMPEzfM', False], + ['Youtube ID for .75x speed', '', False], + ['Youtube ID for 1.25x speed', '', False], + ['Youtube ID for 1.5x speed', '', False]]) diff --git a/cms/djangoapps/contentstore/features/video.feature b/cms/djangoapps/contentstore/features/video.feature index e4caa70ef6..86cd2c27c9 100644 --- a/cms/djangoapps/contentstore/features/video.feature +++ b/cms/djangoapps/contentstore/features/video.feature @@ -22,3 +22,30 @@ Feature: Video Component Given I have created a Video component And I have toggled captions Then when I view the video it does show the captions + + Scenario: Autoplay is disabled in Studio for Video Alpha + Given I have created a Video Alpha component + Then when I view the videoalpha it does not have autoplay enabled + + Scenario: User can view Video Alpha metadata + Given I have created a Video Alpha component + And I edit and select Settings + Then I see the correct videoalpha settings and default values + + Scenario: User can modify Video Alpha display name + Given I have created a Video Alpha component + And I edit and select Settings + Then I can modify the display name + And my display name change is persisted on save + + @skip + Scenario: Video Alpha captions are hidden when "show captions" is false + Given I have created a Video Alpha component + And I have set "show captions" to False + Then when I view the video it does not show the captions + + @skip + Scenario: Video Alpha captions are shown when "show captions" is true + Given I have created a Video Alpha component + And I have set "show captions" to True + Then when I view the video it does show the captions diff --git a/cms/djangoapps/contentstore/features/video.py b/cms/djangoapps/contentstore/features/video.py index a6a362befc..d22e580222 100644 --- a/cms/djangoapps/contentstore/features/video.py +++ b/cms/djangoapps/contentstore/features/video.py @@ -5,9 +5,9 @@ from lettuce import world, step ############### ACTIONS #################### -@step('when I view the video it does not have autoplay enabled') -def does_not_autoplay(_step): - assert world.css_find('.video')[0]['data-autoplay'] == 'False' +@step('when I view the (.*) it does not have autoplay enabled') +def does_not_autoplay(_step, video_type): + assert world.css_find('.%s' % video_type)[0]['data-autoplay'] == 'False' assert world.css_has_class('.video_control', 'play') diff --git a/cms/djangoapps/contentstore/features/videoalpha-editor.feature b/cms/djangoapps/contentstore/features/videoalpha-editor.feature deleted file mode 100644 index 6021772c1c..0000000000 --- a/cms/djangoapps/contentstore/features/videoalpha-editor.feature +++ /dev/null @@ -1,25 +0,0 @@ -Feature: Video Alpha Component Editor - As a course author, I want to be able to create videoalpha components. - - Scenario: User can view metadata - Given I have created a Video Alpha component - And I edit and select Settings - Then I see the correct videoalpha settings and default values - - Scenario: User can modify display name - Given I have created a Video Alpha component - And I edit and select Settings - Then I can modify the display name - And my display name change is persisted on save - - @skip - Scenario: Captions are hidden when "show captions" is false - Given I have created a Video component - And I have set "show captions" to False - Then when I view the video it does not show the captions - - @skip - Scenario: Captions are shown when "show captions" is true - Given I have created a Video component - And I have set "show captions" to True - Then when I view the video it does show the captions diff --git a/cms/djangoapps/contentstore/features/videoalpha-editor.py b/cms/djangoapps/contentstore/features/videoalpha-editor.py deleted file mode 100644 index 2d882d2fda..0000000000 --- a/cms/djangoapps/contentstore/features/videoalpha-editor.py +++ /dev/null @@ -1,18 +0,0 @@ -# disable missing docstring -# pylint: disable=C0111 - -from lettuce import world, step - - -@step('I see the correct videoalpha settings and default values$') -def correct_videoalpha_settings(_step): - world.verify_all_setting_entries([['Default Speed', '', False], - ['Display Name', 'Video Alpha', False], - ['Download Track', '', False], - ['Download Video', '', False], - ['HTML5 Subtitles', '', False], - ['Show Captions', 'True', False], - ['Speed: .75x', '', False], - ['Speed: 1.25x', '', False], - ['Speed: 1.5x', '', False], - ['Video Sources', '', False]]) diff --git a/cms/djangoapps/contentstore/features/videoalpha.feature b/cms/djangoapps/contentstore/features/videoalpha.feature deleted file mode 100644 index 58f32da68b..0000000000 --- a/cms/djangoapps/contentstore/features/videoalpha.feature +++ /dev/null @@ -1,6 +0,0 @@ -Feature: Video Alpha Component - As a course author, I want to be able to view my created videos in Studio. - - Scenario: Autoplay is disabled in Studio - Given I have created a Video Alpha component - Then when I view the video alpha it does not have autoplay enabled diff --git a/cms/djangoapps/contentstore/features/videoalpha.py b/cms/djangoapps/contentstore/features/videoalpha.py deleted file mode 100644 index f95284a00a..0000000000 --- a/cms/djangoapps/contentstore/features/videoalpha.py +++ /dev/null @@ -1,10 +0,0 @@ -# disable missing docstring -# pylint: disable=C0111 - -from lettuce import world, step - - -@step('when I view the video alpha it does not have autoplay enabled') -def does_not_autoplay(_step): - assert world.css_find('.videoalpha')[0]['data-autoplay'] == 'False' - assert world.css_has_class('.video_control', 'play') diff --git a/cms/static/coffee/spec/views/metadata_edit_spec.coffee b/cms/static/coffee/spec/views/metadata_edit_spec.coffee index 8bd37edb77..bcc3cb436b 100644 --- a/cms/static/coffee/spec/views/metadata_edit_spec.coffee +++ b/cms/static/coffee/spec/views/metadata_edit_spec.coffee @@ -334,3 +334,13 @@ describe "Test Metadata Editor", -> it "has an update model method", -> assertUpdateModel(@listView, null, ['a new value']) + + it "can add an entry", -> + expect(@listView.model.get('value').length).toEqual(2) + @listView.$el.find('.setting-add').click() + expect(@listView.$el.find('input.input').length).toEqual(3) + + it "can remove an entry", -> + expect(@listView.model.get('value').length).toEqual(2) + @listView.$el.find('.setting-remove').first().click() + expect(@listView.model.get('value').length).toEqual(1) diff --git a/cms/static/js/views/metadata_editor_view.js b/cms/static/js/views/metadata_editor_view.js index a831e71816..31ac9f800c 100644 --- a/cms/static/js/views/metadata_editor_view.js +++ b/cms/static/js/views/metadata_editor_view.js @@ -319,17 +319,46 @@ CMS.Views.Metadata.List = CMS.Views.Metadata.AbstractEditor.extend({ events : { "click .setting-clear" : "clear", "keypress .setting-input" : "showClearButton", - "change input" : "updateModel" + "change input" : "updateModel", + "click .setting-add" : "addEntry", + "click .setting-remove" : "removeEntry" }, templateName: "metadata-list-entry", getValueFromEditor: function () { - return _.map(this.$el.find('#' + this.uniqueId).val().split(/,/), - function (url) { return url.trim(); }); + return _.map( + this.$el.find('li input'), + function (ele) { return ele.value.trim(); } + ).filter(_.identity); }, setValueInEditor: function (value) { - this.$el.find('.input').val(value.join(', ')); + var list = this.$el.find('ol'); + list.empty(); + _.each(value, function(ele, index) { + var template = _.template( + '
  • ' + + '' + + 'remove' + + '
    • ' + ); + list.append($(template({'ele': ele, 'index': index}))); + }); + }, + + addEntry: function(event) { + event.preventDefault(); + // We don't call updateModel here since it's bound to the + // change event + var list = this.model.get('value') || []; + this.setValueInEditor(list.concat([''])) + }, + + removeEntry: function(event) { + event.preventDefault(); + var entry = $(event.currentTarget).siblings().val(); + this.setValueInEditor(_.without(this.model.get('value'), entry)); + this.updateModel(); } }); diff --git a/cms/templates/js/metadata-list-entry.underscore b/cms/templates/js/metadata-list-entry.underscore index e822a10b15..f0809f6039 100644 --- a/cms/templates/js/metadata-list-entry.underscore +++ b/cms/templates/js/metadata-list-entry.underscore @@ -1,6 +1,9 @@
    - +
    +
      +
      + add diff --git a/common/lib/xmodule/xmodule/tests/test_videoalpha.py b/common/lib/xmodule/xmodule/tests/test_videoalpha.py index cb122b2e9a..838b509cda 100644 --- a/common/lib/xmodule/xmodule/tests/test_videoalpha.py +++ b/common/lib/xmodule/xmodule/tests/test_videoalpha.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- #pylint: disable=W0212 """Test for Video Alpha Xmodule functional logic. -These tests data readed from xml or from mongo. +These test data read from xml, not from mongo. -we have a ModuleStoreTestCase class defined in +We have a ModuleStoreTestCase class defined in common/lib/xmodule/xmodule/modulestore/tests/django_utils.py. You can search for usages of this in the cms and lms tests for examples. You use this so that it will do things like point the modulestore setting to mongo, @@ -238,7 +238,7 @@ class VideoAlphaDescriptorImportTestCase(unittest.TestCase): xml_data = '' output = VideoAlphaDescriptor.from_xml(xml_data, module_system) self.assertEquals(output.youtube_id_0_75, '') - self.assertEquals(output.youtube_id_1_0, '') + self.assertEquals(output.youtube_id_1_0, 'OEoXaMPEzfM') self.assertEquals(output.youtube_id_1_25, '') self.assertEquals(output.youtube_id_1_5, '') self.assertEquals(output.show_captions, True) @@ -344,6 +344,6 @@ class VideoAlphaExportTestCase(unittest.TestCase): desc = VideoAlphaDescriptor(module_system, {'location': location}) xml = desc.export_to_xml(None) - expected = '\n' + expected = '\n' self.assertEquals(expected, xml) diff --git a/common/lib/xmodule/xmodule/videoalpha_module.py b/common/lib/xmodule/xmodule/videoalpha_module.py index a238f7d768..2c79660f36 100644 --- a/common/lib/xmodule/xmodule/videoalpha_module.py +++ b/common/lib/xmodule/xmodule/videoalpha_module.py @@ -36,7 +36,7 @@ log = logging.getLogger(__name__) class VideoAlphaFields(object): """Fields for `VideoAlphaModule` and `VideoAlphaDescriptor`.""" display_name = String( - display_name="Display Name", help="Display name for this module", + display_name="Display Name", help="Display name for this module.", default="Video Alpha", scope=Scope.settings ) @@ -51,28 +51,27 @@ class VideoAlphaFields(object): scope=Scope.settings, default=True ) - # TODO (pfogg): Do we want to show these to the user if HTML5 sources are preferred? youtube_id_1_0 = String( help="This is the Youtube ID reference for the normal speed video.", - display_name="Default Speed", + display_name="Youtube ID", scope=Scope.settings, - default="" + default="OEoXaMPEzfM" ) youtube_id_0_75 = String( help="The Youtube ID for the .75x speed video.", - display_name="Speed: .75x", + display_name="Youtube ID for .75x speed", scope=Scope.settings, default="" ) youtube_id_1_25 = String( help="The Youtube ID for the 1.25x speed video.", - display_name="Speed: 1.25x", + display_name="Youtube ID for 1.25x speed", scope=Scope.settings, default="" ) youtube_id_1_5 = String( help="The Youtube ID for the 1.5x speed video.", - display_name="Speed: 1.5x", + display_name="Youtube ID for 1.5x speed", scope=Scope.settings, default="" ) @@ -95,7 +94,7 @@ class VideoAlphaFields(object): default="" ) html5_sources = List( - help="A comma-separated list of filenames to be used with HTML5 video.", + help="A list of filenames to be used with HTML5 video.", display_name="Video Sources", scope=Scope.settings, default=[] @@ -205,6 +204,8 @@ class VideoAlphaDescriptor(VideoAlphaFields, TabsEditingDescriptor, RawDescripto def __init__(self, *args, **kwargs): super(VideoAlphaDescriptor, self).__init__(*args, **kwargs) + # For backwards compatibility -- if we've got XML data, parse + # it out and set the metadata fields if self.data: model_data = VideoAlphaDescriptor._parse_video_xml(self.data) self._model_data.update(model_data) @@ -213,9 +214,7 @@ class VideoAlphaDescriptor(VideoAlphaFields, TabsEditingDescriptor, RawDescripto @property def non_editable_metadata_fields(self): non_editable_fields = super(TabsEditingDescriptor, self).non_editable_metadata_fields - non_editable_fields.extend([VideoAlphaFields.start_time, - VideoAlphaFields.end_time]) - return non_editable_fields + return non_editable_fields + [VideoAlphaFields.start_time, VideoAlphaFields.end_time] @classmethod def from_xml(cls, xml_data, system, org=None, course=None): diff --git a/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py b/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py index b4341f8508..a0069e7d53 100644 --- a/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py +++ b/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py @@ -46,10 +46,10 @@ class TestVideo(BaseTestXmodule): context = self.item_module.get_html() sources = { - 'main': '.../mit-3091x/M-3091X-FA12-L21-3_100.mp4', - 'mp4': '.../mit-3091x/M-3091X-FA12-L21-3_100.mp4', - 'webm': '.../mit-3091x/M-3091X-FA12-L21-3_100.webm', - 'ogv': '.../mit-3091x/M-3091X-FA12-L21-3_100.ogv' + 'main': 'example.mp4', + 'mp4': 'example.mp4', + 'webm': 'example.webm', + 'ogv': 'example.ogv' } expected_context = { @@ -79,9 +79,9 @@ class TestVideoNonYouTube(TestVideo): sub="a_sub_file.srt.sjson" start_time="01:00:03" end_time="01:00:10" > - - - + + + """ MODEL_DATA = { @@ -93,10 +93,10 @@ class TestVideoNonYouTube(TestVideo): the template generates an empty string for the YouTube streams. """ sources = { - u'main': u'.../mit-3091x/M-3091X-FA12-L21-3_100.mp4', - u'mp4': u'.../mit-3091x/M-3091X-FA12-L21-3_100.mp4', - u'webm': u'.../mit-3091x/M-3091X-FA12-L21-3_100.webm', - u'ogv': u'.../mit-3091x/M-3091X-FA12-L21-3_100.ogv' + u'main': u'example.mp4', + u'mp4': u'example.mp4', + u'webm': u'example.webm', + u'ogv': u'example.ogv' } context = self.item_module.get_html() @@ -112,7 +112,7 @@ class TestVideoNonYouTube(TestVideo): 'start': 3603.0, 'sub': 'a_sub_file.srt.sjson', 'track': '', - 'youtube_streams': '', + 'youtube_streams': '1.00:OEoXaMPEzfM', 'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', True) } diff --git a/lms/djangoapps/courseware/tests/test_videoalpha_xml.py b/lms/djangoapps/courseware/tests/test_videoalpha_xml.py index b381d406f5..4a4e378174 100644 --- a/lms/djangoapps/courseware/tests/test_videoalpha_xml.py +++ b/lms/djangoapps/courseware/tests/test_videoalpha_xml.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Test for VideoAlpha Xmodule functional logic. -These tests data readed from xml, not from mongo. +These test data read from xml, not from mongo. We have a ModuleStoreTestCase class defined in common/lib/xmodule/xmodule/modulestore/tests/django_utils.py. @@ -30,9 +30,9 @@ SOURCE_XML = """ sub="a_sub_file.srt.sjson" start_time="01:00:03" end_time="01:00:10" > - - - + + + """ @@ -72,10 +72,10 @@ class VideoAlphaModuleUnitTest(unittest.TestCase): module.runtime.render_template = lambda template, context: context sources = { - 'main': '.../mit-3091x/M-3091X-FA12-L21-3_100.mp4', - 'mp4': '.../mit-3091x/M-3091X-FA12-L21-3_100.mp4', - 'ogv': '.../mit-3091x/M-3091X-FA12-L21-3_100.ogv', - 'webm': '.../mit-3091x/M-3091X-FA12-L21-3_100.webm', + 'main': 'example.mp4', + 'mp4': 'example.mp4', + 'webm': 'example.webm', + 'ogv': 'example.ogv' } expected_context = {