From 82a9b84f3455037dc096e29fd1f39cbf5ca72098 Mon Sep 17 00:00:00 2001 From: Nimisha Asthagiri Date: Thu, 6 Nov 2014 09:15:16 -0500 Subject: [PATCH] Fix broken test (due to merge conflict). --- lms/djangoapps/mobile_api/users/tests.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lms/djangoapps/mobile_api/users/tests.py b/lms/djangoapps/mobile_api/users/tests.py index 25c9353053..8a851cd182 100644 --- a/lms/djangoapps/mobile_api/users/tests.py +++ b/lms/djangoapps/mobile_api/users/tests.py @@ -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)