Remove assertContains from user signature api tests

misago/users/api/userendpoints/signature.py

@@ -55,14 +55,8 @@ def get_signature_options(user):
 
 def edit_signature(request, user):
     serializer = EditSignatureSerializer(user, data=request.data)
-    if serializer.is_valid():
-        set_user_signature(request, user, serializer.validated_data['signature'])
-        user.save(update_fields=['signature', 'signature_parsed', 'signature_checksum'])
-        return get_signature_options(user)
-    else:
-        return Response(
-            {
-                'detail': serializer.errors
-            },
-            status=400,
-        )
+    serializer.is_valid(raise_exception=True)
+
+    set_user_signature(request, user, serializer.validated_data['signature'])
+    user.save(update_fields=['signature', 'signature_parsed', 'signature_checksum'])
+    return get_signature_options(user)

misago/users/tests/test_user_signature_api.py

@@ -16,7 +16,10 @@ class UserSignatureTests(AuthenticatedUserTestCase):
         })
 
         response = self.client.get(self.link)
-        self.assertContains(response, "You don't have permission to change", status_code=403)
+        self.assertEqual(response.status_code, 403)
+        self.assertEqual(response.json(), {
+            'detail': "You don't have permission to change signature.",
+        })
 
     def test_signature_locked(self):
         """locked edit signature returns 403"""
@@ -29,7 +32,11 @@ class UserSignatureTests(AuthenticatedUserTestCase):
         self.user.save()
 
         response = self.client.get(self.link)
-        self.assertContains(response, 'Your siggy is banned', status_code=403)
+        self.assertEqual(response.status_code, 403)
+        self.assertEqual(response.json(), {
+            'detail': "Your signature is locked. You can't change it.",
+            'extra': "<p>Your siggy is banned.</p>",
+        })
 
     def test_get_signature(self):
         """GET to api returns json with no signature"""
@@ -42,8 +49,10 @@ class UserSignatureTests(AuthenticatedUserTestCase):
 
         response = self.client.get(self.link)
         self.assertEqual(response.status_code, 200)
-
-        self.assertFalse(response.json()['signature'])
+        self.assertEqual(response.json(), {
+            'signature': None,
+            'limit': 256,
+        })
 
     def test_post_empty_signature(self):
         """empty POST empties user signature"""
@@ -61,8 +70,10 @@ class UserSignatureTests(AuthenticatedUserTestCase):
             },
         )
         self.assertEqual(response.status_code, 200)
-
-        self.assertFalse(response.json()['signature'])
+        self.assertEqual(response.json(), {
+            'signature': None,
+            'limit': 256,
+        })
 
     def test_post_too_long_signature(self):
         """too long new signature errors"""
@@ -79,7 +90,10 @@ class UserSignatureTests(AuthenticatedUserTestCase):
                 'signature': 'abcd' * 1000,
             },
         )
-        self.assertContains(response, 'too long', status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {
+            'non_field_errors': ["Signature is too long."],
+        })
 
     def test_post_good_signature(self):
         """POST with good signature changes user signature"""
@@ -97,12 +111,14 @@ class UserSignatureTests(AuthenticatedUserTestCase):
             },
         )
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {
+            'signature': {
+                'html': '<p>Hello, <strong>bros</strong>!</p>',
+                'plain': 'Hello, **bros**!',
+            },
+            'limit': 256,
+        })
 
-        self.assertEqual(
-            response.json()['signature']['html'], '<p>Hello, <strong>bros</strong>!</p>'
-        )
-        self.assertEqual(response.json()['signature']['plain'], 'Hello, **bros**!')
-
+        # API updates user in database
         self.reload_user()
-
         self.assertEqual(self.user.signature_parsed, '<p>Hello, <strong>bros</strong>!</p>')