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

Upload files explicitly in tests.

Browse Source
This commit is contained in:
polesye
2014-03-11 18:41:24 +02:00
parent ddf41ce9c5
commit 40c1090ca8
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lms/djangoapps/courseware/features/video.feature
View File

@@ -81,8 +81,11 @@ Feature: LMS Video component
# 10
Scenario: Language menu works correctly in Video component
Given the course has a Video component in Youtube mode:
| transcripts | sub |
Given I am registered for the course "test_course"
And I have a "chinese_transcripts.srt" transcript file in assets
And I have a "subs_OEoXaMPEzfM.srt.sjson" transcript file in assets
And it has a video in "Youtube" mode:
| transcripts | sub |
| {"zh": "chinese_transcripts.srt"} | OEoXaMPEzfM |
And I make sure captions are closed
And I see video menu "language" with correct items
@@ -93,7 +96,9 @@ Feature: LMS Video component
# 11
Scenario: CC button works correctly w/o english transcript in HTML5 mode of Video component
Given the course has a Video component in HTML5 mode:
Given I am registered for the course "test_course"
And I have a "chinese_transcripts.srt" transcript file in assets
And it has a video in "HTML5" mode:
| transcripts |
| {"zh": "chinese_transcripts.srt"} |
And I make sure captions are opened
@@ -111,7 +116,9 @@ Feature: LMS Video component
# 13
Scenario: CC button works correctly w/o english transcript in Youtube mode of Video component
Given the course has a Video component in Youtube mode:
Given I am registered for the course "test_course"
And I have a "chinese_transcripts.srt" transcript file in assets
And it has a video in "Youtube" mode:
| transcripts |
| {"zh": "chinese_transcripts.srt"} |
And I make sure captions are opened
@@ -132,7 +139,9 @@ Feature: LMS Video component
# 16
Scenario: Video is aligned correctly if transcript is visible in fullscreen mode
Given the course has a Video component in HTML5 mode:
Given I am registered for the course "test_course"
And I have a "subs_OEoXaMPEzfM.srt.sjson" transcript file in assets
And it has a video in "HTML5" mode:
| sub |
| OEoXaMPEzfM |
And I make sure captions are opened
@@ -147,7 +156,9 @@ Feature: LMS Video component
# 18
Scenario: Video is aligned correctly on transcript toggle in fullscreen mode
Given the course has a Video component in Youtube mode:
Given I am registered for the course "test_course"
And I have a "subs_OEoXaMPEzfM.srt.sjson" transcript file in assets
And it has a video in "Youtube" mode:
| sub |
| OEoXaMPEzfM |
And I make sure captions are opened
@@ -159,6 +170,7 @@ Feature: LMS Video component
# 19
Scenario: Download Transcript button works correctly in Video component
Given I am registered for the course "test_course"
And I have a "subs_OEoXaMPEzfM.srt.sjson" transcript file in assets
And it has a video "A" in "Youtube" mode in position "1" of sequential:
| sub | download_track |
| OEoXaMPEzfM | true |
@@ -179,7 +191,10 @@ Feature: LMS Video component
# 20
Scenario: Youtube video has correct transcript if fields for other speeds are filled.
Given the course has a Video component in Youtube mode:
Given I am registered for the course "test_course"
And I have a "subs_OEoXaMPEzfM.srt.sjson" transcript file in assets
And I have a "subs_b7xgknqkQk8.srt.sjson" transcript file in assets
And it has a video in "Youtube" mode:
| sub | youtube_id_1_5 |
| OEoXaMPEzfM | b7xgknqkQk8 |
And I make sure captions are opened

14
lms/djangoapps/courseware/features/video.py
View File

@@ -95,8 +95,6 @@ def add_video_to_course(course, player_mode, hashes, display_name='Video'):
'metadata': {},
}
course_location =world.scenario_dict['COURSE'].location
if hashes:
kwargs['metadata'].update(hashes[0])
@@ -135,18 +133,6 @@ def add_video_to_course(course, player_mode, hashes, display_name='Video'):
'html5_sources': HTML5_SOURCES_INCORRECT
})
if kwargs['metadata'].get('sub'):
filename = _get_sjson_filename(kwargs['metadata']['sub'], 'en')
_upload_file(filename, course_location)
if kwargs['metadata'].get('transcripts'):
for lang, filename in kwargs['metadata']['transcripts'].items():
_upload_file(filename, course_location)
if kwargs['metadata'].get('youtube_id_1_5'):
filename = _get_sjson_filename(kwargs['metadata']['youtube_id_1_5'], 'en')
_upload_file(filename, course_location)
world.scenario_dict['VIDEO'] = world.ItemFactory.create(**kwargs)