fix quality issues and broken order of execution

This commit is contained in:
Rene Sorel
2016-09-28 15:24:39 +02:00
parent 66b32318ff
commit 1b985a5ce0
2 changed files with 7 additions and 3 deletions

View File

@@ -274,7 +274,6 @@ class TestUserEnrollmentApi(UrlResetMixin, MobileAPITestCase, MobileAuthUserTest
response_discussion_url = response.data[0]['course']['discussion_url'] # pylint: disable=E1101
self.assertIn('/api/discussion/v1/courses/{}'.format(self.course.id), response_discussion_url)
def test_org_query(self):
self.login()
@@ -289,11 +288,13 @@ class TestUserEnrollmentApi(UrlResetMixin, MobileAPITestCase, MobileAuthUserTest
]
# Enroll in all the courses
self.assertEqual(len(response.data), 3)
for course in courses:
self.enroll(course.id)
response = self.api_response(data={'org':'edX'})
response = self.api_response(data={'org': 'edX'})
# Test for 3 expected courses
self.assertEqual(len(response.data), 3)
# Verify only edX courses are returned
for entry in response.data:

View File

@@ -271,6 +271,9 @@ class UserCourseEnrollmentsList(generics.ListAPIView):
pagination_class = None
def is_org(self, check_org, course_org):
"""
Check course org matches request org param or no param provided
"""
return check_org is None or (check_org.lower() == course_org.lower())
def get_queryset(self):