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

Merge pull request #5867 from edx/mobile/fix-broken-master

Browse Source 
Fix mobile_api broken test (due to merge conflict).
This commit is contained in:
Nimisha Asthagiri
2014-11-06 11:17:14 -05:00
parent cb5e90fc08 82a9b84f34
commit 5d920190a9
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/djangoapps/mobile_api/users/tests.py
View File

@@ -128,14 +128,13 @@ class TestUserApi(ModuleStoreTestCase, APITestCase):
self.assertEqual(serialized['course']['number'], self.course.id.course)
self.assertEqual(serialized['course']['org'], self.course.id.org)
@skip("Broken as part of a merge from release. See MA-117")
def test_course_serializer_with_display_overrides(self):
self.course.display_coursenumber = "overridden_number"
self.course.display_organization = "overridden_org"
modulestore().update_item(self.course, self.user.id)
self.client.login(username=self.username, password=self.password)
self._enroll()
self._enroll(self.course)
serialized = CourseEnrollmentSerializer(CourseEnrollment.enrollments_for_user(self.user)[0]).data # pylint: disable=E1101
self.assertEqual(serialized['course']['number'], self.course.display_coursenumber)
self.assertEqual(serialized['course']['org'], self.course.display_organization)