Просмотр исходного кода

Small cleanup of response_json assertions

Rafał Pitoń 7 лет назад
Родитель
Сommit
10b067a244

+ 31 - 31
misago/threads/tests/test_search.py

@@ -28,10 +28,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get(self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -40,10 +40,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -56,10 +56,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=ip' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -72,10 +72,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=elit' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -92,10 +92,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=ipsum' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -112,10 +112,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=ipsum' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -128,10 +128,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=ipsum' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 results = provider['results']['results']
                 self.assertEqual(len(results), 1)
@@ -148,10 +148,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=mars atmosphere' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 results = provider['results']['results']
                 self.assertEqual(len(results), 1)
@@ -166,10 +166,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=Mars atmosphere' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 results = provider['results']['results']
                 self.assertEqual(len(results), 1)
@@ -188,10 +188,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=MMM' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('threads', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('threads', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 results = provider['results']['results']
                 self.assertEqual(len(results), 1)
@@ -200,7 +200,7 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=Marines Medics' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'threads':
                 results = provider['results']['results']
                 self.assertEqual(len(results), 1)

+ 14 - 14
misago/threads/tests/test_thread_patch_api.py

@@ -487,8 +487,8 @@ class ThreadMoveApiTests(ThreadPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertEqual(reponse_json['category'], self.category_b.pk)
+        response_json = response.json()
+        self.assertEqual(response_json['category'], self.category_b.pk)
 
         self.override_other_acl({})
 
@@ -521,8 +521,8 @@ class ThreadMoveApiTests(ThreadPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertEqual(reponse_json['category'], self.category_b.pk)
+        response_json = response.json()
+        self.assertEqual(response_json['category'], self.category_b.pk)
 
         self.override_other_acl({})
 
@@ -1027,8 +1027,8 @@ class ThreadHideApiTests(ThreadPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertTrue(reponse_json['is_hidden'])
+        response_json = response.json()
+        self.assertTrue(response_json['is_hidden'])
 
         self.override_acl({'can_hide_threads': 1})
 
@@ -1174,8 +1174,8 @@ class ThreadUnhideApiTests(ThreadPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertFalse(reponse_json['is_hidden'])
+        response_json = response.json()
+        self.assertFalse(response_json['is_hidden'])
 
         self.override_acl({'can_hide_threads': 1})
 
@@ -1261,8 +1261,8 @@ class ThreadSubscribeApiTests(ThreadPatchApiTestCase):
 
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertFalse(reponse_json['subscription'])
+        response_json = response.json()
+        self.assertFalse(response_json['subscription'])
 
         thread_json = self.get_thread_json()
         self.assertFalse(thread_json['subscription'])
@@ -1284,8 +1284,8 @@ class ThreadSubscribeApiTests(ThreadPatchApiTestCase):
 
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertTrue(reponse_json['subscription'])
+        response_json = response.json()
+        self.assertTrue(response_json['subscription'])
 
         thread_json = self.get_thread_json()
         self.assertTrue(thread_json['subscription'])
@@ -1307,8 +1307,8 @@ class ThreadSubscribeApiTests(ThreadPatchApiTestCase):
 
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIsNone(reponse_json['subscription'])
+        response_json = response.json()
+        self.assertIsNone(response_json['subscription'])
 
         thread_json = self.get_thread_json()
         self.assertIsNone(thread_json['subscription'])

+ 18 - 18
misago/threads/tests/test_thread_postpatch_api.py

@@ -101,8 +101,8 @@ class PostProtectApiTests(ThreadPostPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertTrue(reponse_json['is_protected'])
+        response_json = response.json()
+        self.assertTrue(response_json['is_protected'])
 
         self.refresh_post()
         self.assertTrue(self.post.is_protected)
@@ -125,8 +125,8 @@ class PostProtectApiTests(ThreadPostPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertFalse(reponse_json['is_protected'])
+        response_json = response.json()
+        self.assertFalse(response_json['is_protected'])
 
         self.refresh_post()
         self.assertFalse(self.post.is_protected)
@@ -151,8 +151,8 @@ class PostProtectApiTests(ThreadPostPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertTrue(reponse_json['is_protected'])
+        response_json = response.json()
+        self.assertTrue(response_json['is_protected'])
 
         self.refresh_post()
         self.assertTrue(self.post.is_protected)
@@ -183,8 +183,8 @@ class PostProtectApiTests(ThreadPostPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertFalse(reponse_json['is_protected'])
+        response_json = response.json()
+        self.assertFalse(response_json['is_protected'])
 
         self.refresh_post()
         self.assertFalse(self.post.is_protected)
@@ -302,8 +302,8 @@ class PostApproveApiTests(ThreadPostPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertFalse(reponse_json['is_unapproved'])
+        response_json = response.json()
+        self.assertFalse(response_json['is_unapproved'])
 
         self.refresh_post()
         self.assertFalse(self.post.is_unapproved)
@@ -482,8 +482,8 @@ class PostHideApiTests(ThreadPostPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertTrue(reponse_json['is_hidden'])
+        response_json = response.json()
+        self.assertTrue(response_json['is_hidden'])
 
         self.refresh_post()
         self.assertTrue(self.post.is_hidden)
@@ -503,8 +503,8 @@ class PostHideApiTests(ThreadPostPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertTrue(reponse_json['is_hidden'])
+        response_json = response.json()
+        self.assertTrue(response_json['is_hidden'])
 
         self.refresh_post()
         self.assertTrue(self.post.is_hidden)
@@ -715,8 +715,8 @@ class PostUnhideApiTests(ThreadPostPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertFalse(reponse_json['is_hidden'])
+        response_json = response.json()
+        self.assertFalse(response_json['is_hidden'])
 
         self.refresh_post()
         self.assertFalse(self.post.is_hidden)
@@ -742,8 +742,8 @@ class PostUnhideApiTests(ThreadPostPatchApiTestCase):
         )
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertFalse(reponse_json['is_hidden'])
+        response_json = response.json()
+        self.assertFalse(response_json['is_hidden'])
 
         self.refresh_post()
         self.assertFalse(self.post.is_hidden)

+ 3 - 3
misago/threads/tests/test_thread_start_api.py

@@ -209,9 +209,9 @@ class StartThreadTests(AuthenticatedUserTestCase):
 
         thread = self.user.thread_set.all()[:1][0]
 
-        thread_json = response.json()
-        self.assertEqual(thread_json['title'], "Hello, I am test thread!")
-        self.assertEqual(thread_json['url'], thread.get_absolute_url())
+        response_json = response.json()
+        self.assertEqual(response_json['title'], "Hello, I am test thread!")
+        self.assertEqual(response_json['url'], thread.get_absolute_url())
 
         self.override_acl()
         response = self.client.get(thread.get_absolute_url())

+ 19 - 19
misago/users/tests/test_auth_api.py

@@ -26,8 +26,8 @@ class GatewayTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertIsNone(user_json['id'])
+        response_json = response.json()
+        self.assertIsNone(response_json['id'])
 
     def test_login(self):
         """api signs user in"""
@@ -46,9 +46,9 @@ class GatewayTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertEqual(user_json['id'], user.id)
-        self.assertEqual(user_json['username'], user.username)
+        response_json = response.json()
+        self.assertEqual(response_json['id'], user.id)
+        self.assertEqual(response_json['username'], user.username)
 
     def test_login_whitespaces_password(self):
         """api signs user in with password left untouched"""
@@ -79,9 +79,9 @@ class GatewayTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertEqual(user_json['id'], user.id)
-        self.assertEqual(user_json['username'], user.username)
+        response_json = response.json()
+        self.assertEqual(response_json['id'], user.id)
+        self.assertEqual(response_json['username'], user.username)
 
     def test_submit_no_data(self):
         """login api errors for no body"""
@@ -147,8 +147,8 @@ class GatewayTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertIsNone(user_json['id'])
+        response_json = response.json()
+        self.assertIsNone(response_json['id'])
 
     def test_login_banned_staff(self):
         """login api signs banned staff member in"""
@@ -175,9 +175,9 @@ class GatewayTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertEqual(user_json['id'], user.id)
-        self.assertEqual(user_json['username'], user.username)
+        response_json = response.json()
+        self.assertEqual(response_json['id'], user.id)
+        self.assertEqual(response_json['username'], user.username)
 
     def test_login_inactive_admin(self):
         """login api fails to sign admin-activated user in"""
@@ -200,8 +200,8 @@ class GatewayTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertIsNone(user_json['id'])
+        response_json = response.json()
+        self.assertIsNone(response_json['id'])
 
     def test_login_inactive_user(self):
         """login api fails to sign user-activated user in"""
@@ -224,8 +224,8 @@ class GatewayTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertIsNone(user_json['id'])
+        response_json = response.json()
+        self.assertIsNone(response_json['id'])
 
     def test_login_disabled_user(self):
         """its impossible to sign in to disabled account"""
@@ -249,8 +249,8 @@ class GatewayTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertIsNone(user_json['id'])
+        response_json = response.json()
+        self.assertIsNone(response_json['id'])
 
 
 class UserRequirementsTests(TestCase):

+ 4 - 4
misago/users/tests/test_auth_views.py

@@ -78,8 +78,8 @@ class AuthViewsTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertIsNone(user_json['id'])
+        response_json = response.json()
+        self.assertIsNone(response_json['id'])
 
         response = self.client.post(reverse('misago:logout'))
         self.assertEqual(response.status_code, 302)
@@ -87,5 +87,5 @@ class AuthViewsTests(TestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertIsNone(user_json['id'])
+        response_json = response.json()
+        self.assertIsNone(response_json['id'])

+ 24 - 24
misago/users/tests/test_search.py

@@ -27,10 +27,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get(self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('users', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('users', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'users':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -39,10 +39,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('users', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('users', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'users':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -51,10 +51,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=%s' % (self.api_link, self.user.username[0]))
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('users', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('users', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'users':
                 results = provider['results']['results']
                 self.assertEqual(len(results), 1)
@@ -65,10 +65,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=%s' % (self.api_link, self.user.username))
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('users', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('users', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'users':
                 results = provider['results']['results']
                 self.assertEqual(len(results), 1)
@@ -79,10 +79,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=%s' % (self.api_link, self.user.username[-3:]))
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('users', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('users', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'users':
                 results = provider['results']['results']
                 self.assertEqual(len(results), 1)
@@ -93,10 +93,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=BobBoberson' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('users', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('users', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'users':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -112,10 +112,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=DisabledUser' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('users', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('users', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'users':
                 self.assertEqual(provider['results']['results'], [])
 
@@ -126,10 +126,10 @@ class SearchApiTests(AuthenticatedUserTestCase):
         response = self.client.get('%s?q=DisabledUser' % self.api_link)
         self.assertEqual(response.status_code, 200)
 
-        reponse_json = response.json()
-        self.assertIn('users', [p['id'] for p in reponse_json])
+        response_json = response.json()
+        self.assertIn('users', [p['id'] for p in response_json])
 
-        for provider in reponse_json:
+        for provider in response_json:
             if provider['id'] == 'users':
                 results = provider['results']['results']
                 self.assertEqual(len(results), 1)

+ 10 - 10
misago/users/tests/test_testutils.py

@@ -34,8 +34,8 @@ class UserTestCaseTests(UserTestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertEqual(user_json['id'], user.id)
+        response_json = response.json()
+        self.assertEqual(response_json['id'], user.id)
 
     def test_login_superuser(self):
         """login_user logs superuser"""
@@ -45,8 +45,8 @@ class UserTestCaseTests(UserTestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertEqual(user_json['id'], user.id)
+        response_json = response.json()
+        self.assertEqual(response_json['id'], user.id)
 
     def test_logout_user(self):
         """logout_user logs user out"""
@@ -57,8 +57,8 @@ class UserTestCaseTests(UserTestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertIsNone(user_json['id'])
+        response_json = response.json()
+        self.assertIsNone(response_json['id'])
 
     def test_logout_superuser(self):
         """logout_user logs superuser out"""
@@ -69,8 +69,8 @@ class UserTestCaseTests(UserTestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertIsNone(user_json['id'])
+        response_json = response.json()
+        self.assertIsNone(response_json['id'])
 
 
 class AuthenticatedUserTestCaseTests(AuthenticatedUserTestCase):
@@ -96,5 +96,5 @@ class SuperUserTestCaseTests(SuperUserTestCase):
         response = self.client.get('/api/auth/')
         self.assertEqual(response.status_code, 200)
 
-        user_json = response.json()
-        self.assertEqual(user_json['id'], self.user.id)
+        response_json = response.json()
+        self.assertEqual(response_json['id'], self.user.id)

+ 28 - 28
misago/users/tests/test_useradmin_views.py

@@ -888,7 +888,7 @@ class UserAdminViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 302)
 
         response = self.client.get(reverse('misago:admin:index'))
-        self.assertContains(response, "delete yourself");
+        self.assertContains(response, "delete yourself")
 
     def test_delete_threads_view_staff(self):
         """delete user threads view validates if user deletes staff"""
@@ -906,7 +906,7 @@ class UserAdminViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 302)
 
         response = self.client.get(reverse('misago:admin:index'))
-        self.assertContains(response, "is admin and");
+        self.assertContains(response, "is admin and")
 
     def test_delete_threads_view_superuser(self):
         """delete user threads view validates if user deletes superuser"""
@@ -924,7 +924,7 @@ class UserAdminViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 302)
 
         response = self.client.get(reverse('misago:admin:index'))
-        self.assertContains(response, "is admin and");
+        self.assertContains(response, "is admin and")
 
     def test_delete_threads_view(self):
         """delete user threads view deletes threads"""
@@ -940,17 +940,17 @@ class UserAdminViewsTests(AdminTestCase):
 
         response = self.client.post(test_link, **self.AJAX_HEADER)
         self.assertEqual(response.status_code, 200)
-
-        response_dict = response.json()
-        self.assertEqual(response_dict['deleted_count'], 10)
-        self.assertFalse(response_dict['is_completed'])
+        self.assertEqual(response.json(), {
+            'deleted_count': 10,
+            'is_completed': False,
+        })
 
         response = self.client.post(test_link, **self.AJAX_HEADER)
         self.assertEqual(response.status_code, 200)
-
-        response_dict = response.json()
-        self.assertEqual(response_dict['deleted_count'], 0)
-        self.assertTrue(response_dict['is_completed'])
+        self.assertEqual(response.json(), {
+            'deleted_count': 0,
+            'is_completed': True,
+        })
 
     def test_delete_posts_view_self(self):
         """delete user posts view validates if user deletes self"""
@@ -964,7 +964,7 @@ class UserAdminViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 302)
 
         response = self.client.get(reverse('misago:admin:index'))
-        self.assertContains(response, "delete yourself");
+        self.assertContains(response, "delete yourself")
 
     def test_delete_posts_view_staff(self):
         """delete user posts view validates if user deletes staff"""
@@ -982,7 +982,7 @@ class UserAdminViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 302)
 
         response = self.client.get(reverse('misago:admin:index'))
-        self.assertContains(response, "is admin and");
+        self.assertContains(response, "is admin and")
 
     def test_delete_posts_view_superuser(self):
         """delete user posts view validates if user deletes superuser"""
@@ -1000,7 +1000,7 @@ class UserAdminViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 302)
 
         response = self.client.get(reverse('misago:admin:index'))
-        self.assertContains(response, "is admin and");
+        self.assertContains(response, "is admin and")
 
     def test_delete_posts_view(self):
         """delete user posts view deletes posts"""
@@ -1017,17 +1017,17 @@ class UserAdminViewsTests(AdminTestCase):
 
         response = self.client.post(test_link, **self.AJAX_HEADER)
         self.assertEqual(response.status_code, 200)
-
-        response_dict = response.json()
-        self.assertEqual(response_dict['deleted_count'], 10)
-        self.assertFalse(response_dict['is_completed'])
+        self.assertEqual(response.json(), {
+            'deleted_count': 10,
+            'is_completed': False,
+        })
 
         response = self.client.post(test_link, **self.AJAX_HEADER)
         self.assertEqual(response.status_code, 200)
-
-        response_dict = response.json()
-        self.assertEqual(response_dict['deleted_count'], 0)
-        self.assertTrue(response_dict['is_completed'])
+        self.assertEqual(response.json(), {
+            'deleted_count': 0,
+            'is_completed': True,
+        })
 
     def test_delete_account_view_self(self):
         """delete user account view validates if user deletes self"""
@@ -1041,7 +1041,7 @@ class UserAdminViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 302)
 
         response = self.client.get(reverse('misago:admin:index'))
-        self.assertContains(response, "delete yourself");
+        self.assertContains(response, "delete yourself")
 
     def test_delete_account_view_staff(self):
         """delete user account view validates if user deletes staff"""
@@ -1059,7 +1059,7 @@ class UserAdminViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 302)
 
         response = self.client.get(reverse('misago:admin:index'))
-        self.assertContains(response, "is admin and");
+        self.assertContains(response, "is admin and")
 
     def test_delete_account_view_superuser(self):
         """delete user account view validates if user deletes superuser"""
@@ -1077,7 +1077,7 @@ class UserAdminViewsTests(AdminTestCase):
         self.assertEqual(response.status_code, 302)
 
         response = self.client.get(reverse('misago:admin:index'))
-        self.assertContains(response, "is admin and");
+        self.assertContains(response, "is admin and")
 
     def test_delete_account_view(self):
         """delete user account view deletes user account"""
@@ -1090,6 +1090,6 @@ class UserAdminViewsTests(AdminTestCase):
 
         response = self.client.post(test_link, **self.AJAX_HEADER)
         self.assertEqual(response.status_code, 200)
-
-        response_dict = response.json()
-        self.assertTrue(response_dict['is_completed'])
+        self.assertEqual(response.json(), {
+            'is_completed': True,
+        })