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

Fix failing tests from merge with master

Browse Source
This commit is contained in:
Calen Pennington
2014-05-09 16:37:17 -04:00
parent c72b0bb293
commit 94c8d86a42
13 changed files with 40 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/djangoapps/student/tests/tests.py
View File

@@ -157,7 +157,7 @@ class DashboardTest(TestCase):
"""
Check that the css class and the status message are in the dashboard html.
"""
CourseEnrollment.enroll(self.user, self.course.location.course_id, mode=mode)
CourseEnrollment.enroll(self.user, self.course.location.course_key, mode=mode)
try:
response = self.client.get(reverse('dashboard'))
except NoReverseMatch:
@@ -179,7 +179,7 @@ class DashboardTest(TestCase):
"""
Check that the css class and the status message are not in the dashboard html.
"""
CourseEnrollment.enroll(self.user, self.course.location.course_id, mode=mode)
CourseEnrollment.enroll(self.user, self.course.location.course_key, mode=mode)
try:
response = self.client.get(reverse('dashboard'))
except NoReverseMatch:

3
common/lib/xmodule/xmodule/video_module/video_handlers.py
View File

@@ -194,8 +194,7 @@ class VideoStudentViewHandlers(object):
transcript_name = self.sub
if transcript_name:
course_location = CourseDescriptor.id_to_location(self.course_id)
course = self.descriptor.runtime.modulestore.get_item(course_location)
course = self.descriptor.runtime.modulestore.get_course(self.course_id)
if course.static_asset_path:
response = Response(
status=307,

2
common/lib/xmodule/xmodule/video_module/video_xfields.py
View File

@@ -79,7 +79,7 @@ class VideoFields(object):
default=False
)
html5_sources = List(
help="The URL or URLs where you’ve posted non-YouTube versions of the video. Each URL must end in .mpeg, .mp4, .ogg, or .webm and cannot be a YouTube URL. Students will be able to view the first listed video that's compatible with the student's computer. To allow students to download these videos, set Video Download Allowed to True.",
help="The URL or URLs where you've posted non-YouTube versions of the video. Each URL must end in .mpeg, .mp4, .ogg, or .webm and cannot be a YouTube URL. Students will be able to view the first listed video that's compatible with the student's computer. To allow students to download these videos, set Video Download Allowed to True.",
display_name="Video File URLs",
scope=Scope.settings,
)