From 66bd8127e68102f61742d6ddfe76ad3435d97f23 Mon Sep 17 00:00:00 2001 From: jmclaus Date: Wed, 18 Sep 2013 23:48:04 +0200 Subject: [PATCH] Acceptance tests now pass --- common/lib/xmodule/xmodule/video_module.py | 2 +- lms/djangoapps/courseware/features/video.feature | 4 ++-- lms/djangoapps/courseware/features/video.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py index 4c269c1f18..d97d5aa144 100644 --- a/common/lib/xmodule/xmodule/video_module.py +++ b/common/lib/xmodule/xmodule/video_module.py @@ -188,7 +188,7 @@ class VideoModule(VideoFields, XModule): 'show_captions': json.dumps(self.show_captions), 'start': self.start_time, 'end': self.end_time, - 'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', True), + 'autoplay': settings.MITX_FEATURES.get('AUTOPLAY_VIDEOS', False), # TODO: Later on the value 1500 should be taken from some global # configuration setting field. 'yt_test_timeout': 1500, diff --git a/lms/djangoapps/courseware/features/video.feature b/lms/djangoapps/courseware/features/video.feature index b741c8bee1..cf30c55cbf 100644 --- a/lms/djangoapps/courseware/features/video.feature +++ b/lms/djangoapps/courseware/features/video.feature @@ -8,9 +8,9 @@ Feature: Video component # Firefox doesn't have HTML5 (only mp4 - fix here) @skip_firefox - Scenario: Autoplay is enabled in LMS for a Video component + Scenario: Autoplay is disabled in LMS for a Video component Given the course has a Video component in HTML5 mode - Then when I view the video it has autoplay enabled + Then when I view the video it does not have autoplay enabled # Youtube testing Scenario: Video component is fully rendered in the LMS in Youtube mode with HTML5 sources diff --git a/lms/djangoapps/courseware/features/video.py b/lms/djangoapps/courseware/features/video.py index 9c26ff5c23..7ca19d291e 100644 --- a/lms/djangoapps/courseware/features/video.py +++ b/lms/djangoapps/courseware/features/video.py @@ -17,7 +17,7 @@ HTML5_SOURCES_INCORRECT = [ ] @step('when I view the (.*) it does not have autoplay enabled$') -def does_autoplay_video(_step, video_type): +def does_not_autoplay(_step, video_type): assert(world.css_find('.%s' % video_type)[0]['data-autoplay'] == 'False')