Fix unit tests

Author: ihalaij1

course/tests.py

@@ -389,7 +389,7 @@ def test_student_enroll(self):
                 'course_slug': self.course.url,
                 'instance_slug': self.current_course_instance.url,
             }),
-            {'user_profiles': [self.user1.id, self.user2.id]}
+            {'user_profiles': f'{self.user1.id},{self.user2.id}'}
         )
         self.assertTrue(self.current_course_instance.is_student(self.user1))
         self.assertTrue(self.current_course_instance.is_student(self.user2))

userprofile/api/tests.py

@@ -12,63 +12,73 @@ def test_get_userlist(self):
         """
         client = APIClient()
         client.force_authenticate(user=self.superuser)
-        response = client.get('/api/v2/users/')
-
-        model = {
-            'count': 4,
-            'next': None,
-            'previous': None,
-        }
-
-        for key in model: # pylint: disable=consider-using-dict-items
-            with self.subTest(key=key):
-                self.assertIn(key, response.data)
-                self.assertEqual(response.data[key], model[key])
 
         results = [
-            {'id': 101,
-             'url': 'http://testserver/api/v2/users/101',
-             'username': 'testUser',
-             'student_id': '12345X',
-             'email': 'test@aplus.com',
-             'full_name': 'Superb Student',
-             'is_external': False},
-            {'id': 102,
-             'url': 'http://testserver/api/v2/users/102',
-             'username': 'grader',
-             'student_id': '67890Y',
-             'email': 'grader@aplus.com',
-             'full_name': 'Grumpy Grader',
-             'is_external': False},
-            {'id': 103,
-             'url': 'http://testserver/api/v2/users/103',
-             'username': 'teacher',
-             'student_id': None,
-             'email': 'teacher@aplus.com',
-             'full_name': 'Tedious Teacher',
-             'is_external': True},
-            {'id': 104,
-             'url': 'http://testserver/api/v2/users/104',
-             'username': 'superuser',
-             'student_id': None,
-             'email': 'superuser@aplus.com',
-             'full_name': 'Super User',
-             'is_external': True},
+            {
+                'id': 101,
+                'url': 'http://testserver/api/v2/users/101',
+                'username': 'testUser',
+                'student_id': '12345X',
+                'email': 'test@aplus.com',
+                'full_name': 'Superb Student',
+                'is_external': False
+            },
+            {
+                'id': 102,
+                'url': 'http://testserver/api/v2/users/102',
+                'username': 'grader',
+                'student_id': '67890Y',
+                'email': 'grader@aplus.com',
+                'full_name': 'Grumpy Grader',
+                'is_external': False
+            },
+            {
+                'id': 103,
+                'url': 'http://testserver/api/v2/users/103',
+                'username': 'teacher',
+                'student_id': None,
+                'email': 'teacher@aplus.com',
+                'full_name': 'Tedious Teacher',
+                'is_external': True
+            },
+            {
+                'id': 104,
+                'url': 'http://testserver/api/v2/users/104',
+                'username': 'superuser',
+                'student_id': None,
+                'email': 'superuser@aplus.com',
+                'full_name': 'Super User',
+                'is_external': True
+            },
         ]
 
-        self.assertIn('results', response.data)
-        r = response.data['results']
-        self.assertEqual(len(r), len(results), "Wrong number of results")
-        for user in results:
+        for i, email in enumerate([result['email'] for result in results]):
+            response = client.get(f'/api/v2/users/?search={email}')
+
+            model = {
+                'count': 1,
+                'next': None,
+                'previous': None,
+            }
+
+            for key in model: # pylint: disable=consider-using-dict-items
+                with self.subTest(key=key):
+                    self.assertIn(key, response.data)
+                    self.assertEqual(response.data[key], model[key])
+
+            self.assertIn('results', response.data)
+            r = response.data['results']
+            self.assertEqual(len(r), 1, "Wrong number of results")
+            user = results[i]
             with self.subTest(id=user['id'], user=user):
                 u = next((u for u in r if u.get('id') == user['id']), None)
                 self.assertNotEqual(u, None, "User with id %s not found from the result list" % (user['id'],))
                 u = dict(u) # convert OrderedDict to dict for more clear error messages
                 self.assertDictEqual(u, user)
 
-        # check that there is no extra fields
-        model['results'] = results
-        self.assertCountEqual(response.data, model)
+            # check that there is no extra fields
+            model['results'] = results
+            self.assertCountEqual(response.data, model)
 
     def test_get_userdetail(self):
         client = APIClient()
@@ -100,27 +110,11 @@ def check_response(url: str, expected_ids: Set[int]) -> None:
             ids = {u['id'] for u in response.data['results']}
             self.assertSetEqual(ids, expected_ids)
 
-        # Check that all individual field filters work (id, student_id, email)
-        # The API uses User.id values, not UserProfile.id, to identify users.
-        check_response('/api/v2/users/?field=id&values=1,2,3,4', set())
-        check_response('/api/v2/users/?field=id&values=101,102,103,104', {101, 102, 103, 104})
-        check_response('/api/v2/users/?field=student_id&values=12345X,67890Y', {101, 102})
-        check_response('/api/v2/users/?field=email&values=teacher@aplus.com,superuser@aplus.com', {103, 104})
-
-        # Check that partial matches are not returned
-        check_response('/api/v2/users/?field=student_id&values=123,67890Y', {102})
+        # Check that email field filter works
+        check_response('/api/v2/users/?search=teacher@aplus.com', {103})
 
         # Check that unmatched values don't cause errors
-        check_response('/api/v2/users/?field=id&values=1,101,999', {101})
+        check_response('/api/v2/users/?search=invalid@aplus.com', set())
 
         # Check that an empty or missing values list returns an empty result
-        check_response('/api/v2/users/?field=email', set())
-
-        # Check the 404 not found response when the given field does not exist.
-        # emails is the wrong name for the field, email is correct.
-        response = client.get('/api/v2/users/?field=emails&values=teacher@aplus.com')
-        self.assertEqual(response.status_code, 404)
-
-        # Invalid values: int expected for id, but str given.
-        response = client.get('/api/v2/users/?field=id&values=hundred')
-        self.assertEqual(response.status_code, 404)
+        check_response('/api/v2/users/', set())