diff --git a/common/djangoapps/enrollment/tests/test_views.py b/common/djangoapps/enrollment/tests/test_views.py index 06e55a6d02..2f4b5fff9a 100644 --- a/common/djangoapps/enrollment/tests/test_views.py +++ b/common/djangoapps/enrollment/tests/test_views.py @@ -87,28 +87,6 @@ class EnrollmentTest(ModuleStoreTestCase, APITestCase): self.assertEqual(1, len(data['course_modes'])) self.assertEqual('professional', data['course_modes'][0]['slug']) - def test_unenroll(self): - # Create a course mode. - CourseModeFactory.create( - course_id=self.course.id, - mode_slug='honor', - mode_display_name='Honor', - ) - - # Create an enrollment - resp = self._create_enrollment() - - # Deactivate the enrollment in the course and verify the URL we get sent to - resp = self.client.post(reverse( - 'courseenrollment', - kwargs={'course_id': (unicode(self.course.id))} - ), {'deactivate': True}) - self.assertEqual(resp.status_code, status.HTTP_200_OK) - data = json.loads(resp.content) - self.assertEqual(unicode(self.course.id), data['course']['course_id']) - self.assertEqual('honor', data['mode']) - self.assertFalse(data['is_active']) - def test_user_not_authenticated(self): # Log out, so we're no longer authenticated self.client.logout() @@ -133,26 +111,6 @@ class EnrollmentTest(ModuleStoreTestCase, APITestCase): resp = self.client.post(reverse('courseenrollment', kwargs={'course_id': (unicode(self.course.id))})) self.assertEqual(resp.status_code, 200) - def test_unenroll_not_enrolled_in_course(self): - # Deactivate the enrollment in the course and verify the URL we get sent to - resp = self.client.post(reverse( - 'courseenrollment', - kwargs={'course_id': (unicode(self.course.id))} - ), {'deactivate': True}) - self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST) - - def test_invalid_enrollment_mode(self): - # Request an enrollment with verified mode, which does not exist for this course. - resp = self.client.post(reverse( - 'courseenrollment', - kwargs={'course_id': (unicode(self.course.id))}), - {'mode': 'verified'} - ) - self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST) - data = json.loads(resp.content) - self.assertEqual(unicode(self.course.id), data['course_id']) - self.assertEqual('honor', data['course_modes'][0]['slug']) - def test_with_invalid_course_id(self): # Create an enrollment resp = self.client.post(reverse('courseenrollment', kwargs={'course_id': 'entirely/fake/course'})) diff --git a/common/djangoapps/enrollment/views.py b/common/djangoapps/enrollment/views.py index c3970cfe58..2b0f409e18 100644 --- a/common/djangoapps/enrollment/views.py +++ b/common/djangoapps/enrollment/views.py @@ -108,11 +108,7 @@ def get_course_enrollment(request, course_id=None): """ try: - if 'mode' in request.DATA: - return Response(api.update_enrollment(request.user.username, course_id, request.DATA['mode'])) - elif 'deactivate' in request.DATA: - return Response(api.deactivate_enrollment(request.user.username, course_id)) - elif course_id and request.method == 'POST': + if course_id and request.method == 'POST': return Response(api.add_enrollment(request.user.username, course_id)) else: return Response(api.get_enrollment(request.user.username, course_id))