Make json tests explicit for username changes api

misago/core/utils.py

@@ -56,6 +56,16 @@ def parse_iso8601_string(value):
     return timezone.make_aware(parsed_value, tz_correction)
 
 
+def serialize_datetime(value):
+    if value is None:
+        return None
+        
+    value = value.isoformat()
+    if value.endswith('+00:00'):
+        value = value[:-6] + 'Z'
+    return value
+
+
 def hide_post_parameters(request):
     """
     Mark request as having sensitive parameters

misago/users/tests/test_usernamechanges_api.py

@@ -1,4 +1,5 @@
 from misago.acl.testutils import override_acl
+from misago.core.utils import serialize_datetime
 from misago.users.testutils import AuthenticatedUserTestCase
 
 
@@ -10,12 +11,46 @@ class UsernameChangesApiTests(AuthenticatedUserTestCase):
     def test_user_can_always_see_his_name_changes(self):
         """list returns own username changes"""
         self.user.set_username('NewUsername', self.user)
+        self.user.save()
 
         override_acl(self.user, {'can_see_users_name_history': False})
 
         response = self.client.get('%s?user=%s' % (self.link, self.user.pk))
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, self.user.username)
+        
+        username_change = self.user.namechanges.all()[0]
+        self.assertEqual(response.json(), {
+            'page': 1,
+            'pages': 1,
+            'count': 1,
+            'first': None,
+            'previous': None,
+            'next': None,
+            'last': None,
+            'before': 0,
+            'more': 0,
+            'results': [
+                {
+                    'id': username_change.id,
+                    'user': {
+                        'id': self.user.id,
+                        'username': 'NewUsername',
+                        'avatars': self.user.avatars,
+                        'url': self.user.get_absolute_url(),
+                    },
+                    'changed_by': {
+                        'id': self.user.id,
+                        'username': 'NewUsername',
+                        'avatars': self.user.avatars,
+                        'url': self.user.get_absolute_url(),
+                    },
+                    'changed_by_username': 'NewUsername',
+                    'changed_on': serialize_datetime(username_change.changed_on),
+                    'new_username': 'NewUsername',
+                    'old_username': 'TestUser'
+                }
+            ],
+        })
 
     def test_list_handles_invalid_filter(self):
         """list raises 404 for invalid filter"""
@@ -25,6 +60,7 @@ class UsernameChangesApiTests(AuthenticatedUserTestCase):
 
         response = self.client.get('%s?user=abcd' % self.link)
         self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.json(), {'detail': "NOT FOUND"})
 
     def test_list_handles_nonexisting_user(self):
         """list raises 404 for invalid user id"""
@@ -34,22 +70,68 @@ class UsernameChangesApiTests(AuthenticatedUserTestCase):
 
         response = self.client.get('%s?user=142141' % self.link)
         self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.json(), {'detail': "No User matches the given query."})
 
     def test_list_handles_search(self):
         """list returns found username changes"""
         self.user.set_username('NewUsername', self.user)
+        self.user.save()
 
         override_acl(self.user, {'can_see_users_name_history': False})
 
         response = self.client.get('%s?user=%s&search=new' % (self.link, self.user.pk))
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, self.user.username)
+        
+        username_change = self.user.namechanges.all()[0]
+        self.assertEqual(response.json(), {
+            'page': 1,
+            'pages': 1,
+            'count': 1,
+            'first': None,
+            'previous': None,
+            'next': None,
+            'last': None,
+            'before': 0,
+            'more': 0,
+            'results': [
+                {
+                    'id': username_change.id,
+                    'user': {
+                        'id': self.user.id,
+                        'username': 'NewUsername',
+                        'avatars': self.user.avatars,
+                        'url': self.user.get_absolute_url(),
+                    },
+                    'changed_by': {
+                        'id': self.user.id,
+                        'username': 'NewUsername',
+                        'avatars': self.user.avatars,
+                        'url': self.user.get_absolute_url(),
+                    },
+                    'changed_by_username': 'NewUsername',
+                    'changed_on': serialize_datetime(username_change.changed_on),
+                    'new_username': 'NewUsername',
+                    'old_username': 'TestUser'
+                }
+            ],
+        })
 
         override_acl(self.user, {'can_see_users_name_history': False})
 
         response = self.client.get('%s?user=%s&search=usernew' % (self.link, self.user.pk))
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['results'], [])
+        self.assertEqual(response.json(), {
+            'page': 1,
+            'pages': 1,
+            'count': 0,
+            'first': None,
+            'previous': None,
+            'next': None,
+            'last': None,
+            'before': 0,
+            'more': 0,
+            'results': [],
+        })
 
     def test_list_denies_permission(self):
         """list denies permission for other user (or all) if no access"""