Browse Source

Remove assertContains from user username api tests

rafalp 6 years ago
parent
commit
9698ddf79a
1 changed files with 31 additions and 24 deletions
  1. 31 24
      misago/users/tests/test_user_username_api.py

+ 31 - 24
misago/users/tests/test_user_username_api.py

@@ -44,13 +44,11 @@ class UserUsernameTests(AuthenticatedUserTestCase):
         response = self.client.get(self.link)
         response = self.client.get(self.link)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.status_code, 200)
 
 
-        response_json = response.json()
-        for i in range(response_json['changes_left']):
+        for i in range(response.json()['changes_left']):
             self.user.set_username('NewName%s' % i, self.user)
             self.user.set_username('NewName%s' % i, self.user)
 
 
         response = self.client.get(self.link)
         response = self.client.get(self.link)
-        response_json = response.json()
-        self.assertEqual(response_json['changes_left'], 0)
+        self.assertEqual(response.json()['changes_left'], 0)
 
 
         response = self.client.post(
         response = self.client.post(
             self.link,
             self.link,
@@ -58,15 +56,17 @@ class UserUsernameTests(AuthenticatedUserTestCase):
                 'username': 'Pointless',
                 'username': 'Pointless',
             },
             },
         )
         )
-
-        self.assertContains(response, 'change your username now', status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json()["detail"], "You can't change your username now.")
         self.assertTrue(self.user.username != 'Pointless')
         self.assertTrue(self.user.username != 'Pointless')
 
 
     def test_change_username_no_input(self):
     def test_change_username_no_input(self):
         """api returns error 400 if new username is empty"""
         """api returns error 400 if new username is empty"""
         response = self.client.post(self.link, data={})
         response = self.client.post(self.link, data={})
-
-        self.assertContains(response, 'Enter new username.', status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {
+            "detail": 'Enter new username.',
+        })
 
 
     def test_change_username_invalid_name(self):
     def test_change_username_invalid_name(self):
         """api returns error 400 if new username is wrong"""
         """api returns error 400 if new username is wrong"""
@@ -76,8 +76,10 @@ class UserUsernameTests(AuthenticatedUserTestCase):
                 'username': '####',
                 'username': '####',
             },
             },
         )
         )
-
-        self.assertContains(response, 'can only contain latin', status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {
+            "detail": "Username can only contain latin alphabet letters and digits.",
+        })
 
 
     def test_change_username(self):
     def test_change_username(self):
         """api changes username and records change"""
         """api changes username and records change"""
@@ -122,14 +124,20 @@ class UserUsernameModerationTests(AuthenticatedUserTestCase):
         })
         })
 
 
         response = self.client.get(self.link)
         response = self.client.get(self.link)
-        self.assertContains(response, "can't rename users", status_code=403)
+        self.assertEqual(response.status_code, 403)
+        self.assertEqual(response.json(), {
+            "detail": "You can't rename users.",
+        })
 
 
         override_acl(self.user, {
         override_acl(self.user, {
             'can_rename_users': 0,
             'can_rename_users': 0,
         })
         })
 
 
         response = self.client.post(self.link)
         response = self.client.post(self.link)
-        self.assertContains(response, "can't rename users", status_code=403)
+        self.assertEqual(response.status_code, 403)
+        self.assertEqual(response.json(), {
+            "detail": "You can't rename users.",
+        })
 
 
     def test_moderate_username(self):
     def test_moderate_username(self):
         """moderate username"""
         """moderate username"""
@@ -155,8 +163,10 @@ class UserUsernameModerationTests(AuthenticatedUserTestCase):
             }),
             }),
             content_type='application/json',
             content_type='application/json',
         )
         )
-
-        self.assertContains(response, "Enter new username", status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {
+            "detail": "Enter new username.",
+        })
 
 
         override_acl(self.user, {
         override_acl(self.user, {
             'can_rename_users': 1,
             'can_rename_users': 1,
@@ -169,12 +179,10 @@ class UserUsernameModerationTests(AuthenticatedUserTestCase):
             }),
             }),
             content_type='application/json',
             content_type='application/json',
         )
         )
-
-        self.assertContains(
-            response,
-            "Username can only contain latin alphabet letters and digits.",
-            status_code=400
-        )
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {
+            "detail": "Username can only contain latin alphabet letters and digits.",
+        })
 
 
         override_acl(self.user, {
         override_acl(self.user, {
             'can_rename_users': 1,
             'can_rename_users': 1,
@@ -187,11 +195,10 @@ class UserUsernameModerationTests(AuthenticatedUserTestCase):
             }),
             }),
             content_type='application/json',
             content_type='application/json',
         )
         )
-
         self.assertEqual(response.status_code, 400)
         self.assertEqual(response.status_code, 400)
-        self.assertContains(
-            response, "Username must be at least 3 characters long.", status_code=400
-        )
+        self.assertEqual(response.json(), {
+            "detail": "Username must be at least 3 characters long.",
+        })
 
 
         override_acl(self.user, {
         override_acl(self.user, {
             'can_rename_users': 1,
             'can_rename_users': 1,