Markup API and tests cleanup

misago/markup/api.py

@@ -1,8 +1,10 @@
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
+from rest_framework import serializers
+
+from misago.threads.validators import validate_post_length
 
 from . import common_flavour, finalise_markup
-from .serializers import MarkupSerializer
 
 
 @api_view(['POST'])
@@ -14,9 +16,17 @@ def parse_markup(request):
     parsing_result = common_flavour(
         request,
         request.user,
-        serializer.data['post'],
+        serializer.data['markup'],
         force_shva=True,
     )
     finalised = finalise_markup(parsing_result['parsed_text'])
 
     return Response({'parsed': finalised})
+
+
+class MarkupSerializer(serializers.Serializer):
+    markup = serializers.CharField(allow_blank=True)
+
+    def validate_markup(self, data):
+        validate_post_length(data)
+        return data

misago/markup/serializers.py

@@ -1,11 +0,0 @@
-from rest_framework import serializers
-
-from misago.threads.validators import validate_post_length
-
-
-class MarkupSerializer(serializers.Serializer):
-    post = serializers.CharField(required=False, allow_blank=True)
-
-    def validate(self, data):
-        validate_post_length(data.get('post', ''))
-        return data

misago/markup/tests/test_api.py

@@ -17,46 +17,94 @@ class ParseMarkupApiTests(AuthenticatedUserTestCase):
         self.logout_user()
 
         response = self.client.post(self.api_link)
-        self.assertContains(response, "This action is not available to guests.", status_code=403)
+        self.assertEqual(response.status_code, 403)
+        self.assertEqual(
+            response.json(), {
+                'detail': "This action is not available to guests.",
+            },
+        )
 
     def test_no_data(self):
         """api handles no data"""
         response = self.client.post(self.api_link)
-        self.assertContains(response, "You have to enter a message.", status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'markup': ["This field is required."],
+            },
+        )
 
     def test_invalid_data(self):
         """api handles post that is invalid type"""
         response = self.client.post(self.api_link, '[]', content_type="application/json")
-        self.assertContains(response, "Invalid data. Expected a dictionary", status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'non_field_errors': ["Invalid data. Expected a dictionary, but got list."],
+            },
+        )
 
         response = self.client.post(self.api_link, '123', content_type="application/json")
-        self.assertContains(response, "Invalid data. Expected a dictionary", status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'non_field_errors': ["Invalid data. Expected a dictionary, but got int."],
+            },
+        )
 
         response = self.client.post(self.api_link, '"string"', content_type="application/json")
-        self.assertContains(response, "Invalid data. Expected a dictionary", status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'non_field_errors': ["Invalid data. Expected a dictionary, but got str."],
+            },
+        )
 
         response = self.client.post(self.api_link, 'malformed', content_type="application/json")
-        self.assertContains(response, "JSON parse error", status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'detail': 'JSON parse error - Expecting value: line 1 column 1 (char 0)',
+            },
+        )
 
-    def test_empty_post(self):
-        """api handles empty post"""
-        response = self.client.post(self.api_link, {'post': ''})
-        self.assertContains(response, "You have to enter a message.", status_code=400)
+    def test_empty_markup(self):
+        """api handles empty markup"""
+        response = self.client.post(self.api_link, {'markup': ''})
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'markup': ["You have to enter a message."],
+            },
+        )
 
         # regression test for #929
-        response = self.client.post(self.api_link, {'post': '\n'})
-        self.assertContains(response, "You have to enter a message.", status_code=400)
-
-    def test_invalid_post(self):
-        """api handles invalid post type"""
-        response = self.client.post(self.api_link, {'post': 123})
-        self.assertContains(
-            response,
-            "Posted message should be at least 5 characters long (it has 3).",
-            status_code=400
-        )
-
-    def test_valid_post(self):
-        """api returns parsed markup for valid post"""
-        response = self.client.post(self.api_link, {'post': 'Lorem ipsum dolor met!'})
-        self.assertContains(response, "<p>Lorem ipsum dolor met!</p>")
+        response = self.client.post(self.api_link, {'markup': '\n'})
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'markup': ["You have to enter a message."],
+            },
+        )
+
+    def test_invalid_markup(self):
+        """api handles invalid markup type"""
+        response = self.client.post(self.api_link, {'markup': 123})
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'markup': [
+                    "Posted message should be at least 5 characters long (it has 3)."
+                ],
+            },
+        )
+        
+    def test_valid_markup(self):
+        """api returns parsed markup for valid markup"""
+        response = self.client.post(self.api_link, {'markup': 'Lorem ipsum dolor met!'})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(
+            response.json(), {
+                'parsed': '<p>Lorem ipsum dolor met!</p>',
+            },
+        )

misago/users/tests/test_user_changeemail_api.py

@@ -23,13 +23,12 @@ class UserChangeEmailTests(AuthenticatedUserTestCase):
     def test_empty_input(self):
         """api errors correctly for empty input"""
         response = self.client.post(self.link, data={})
-
         self.assertEqual(response.status_code, 400)
         self.assertEqual(
             response.json(), {
                 'new_email': ["This field is required."],
                 'password': ["This field is required."],
-            }
+            },
         )
 
     def test_invalid_password(self):
@@ -41,7 +40,12 @@ class UserChangeEmailTests(AuthenticatedUserTestCase):
                 'password': 'Lor3mIpsum',
             },
         )
-        self.assertContains(response, 'password is invalid', status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'password': ["Entered password is invalid."],
+            },
+        )
 
     def test_invalid_input(self):
         """api errors correctly for invalid input"""
@@ -52,7 +56,6 @@ class UserChangeEmailTests(AuthenticatedUserTestCase):
                 'password': self.USER_PASSWORD,
             },
         )
-
         self.assertEqual(response.status_code, 400)
         self.assertEqual(response.json(), {
             'new_email': ["This field may not be blank."],
@@ -65,7 +68,6 @@ class UserChangeEmailTests(AuthenticatedUserTestCase):
                 'password': self.USER_PASSWORD,
             },
         )
-
         self.assertEqual(response.status_code, 400)
         self.assertEqual(response.json(), {
             'new_email': ["Enter a valid email address."],
@@ -82,7 +84,12 @@ class UserChangeEmailTests(AuthenticatedUserTestCase):
                 'password': self.USER_PASSWORD,
             },
         )
-        self.assertContains(response, 'not available', status_code=400)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.json(), {
+                'new_email': ["This e-mail address is not available."],
+            },
+        )
 
     def test_change_email(self):
         """api allows users to change their e-mail addresses"""