encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 19:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sanitise JSON error messages

Browse Source
This commit is contained in:
Tom Christie 2012-10-11 11:21:50 +01:00
parent 83f39b3dce
commit 9094f93d18
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rest_framework/tests/views.py
View File

@ -1,3 +1,4 @@
import copy
from django.test import TestCase from django.test import TestCase
from django.test.client import RequestFactory from django.test.client import RequestFactory
from rest_framework import status from rest_framework import status
@ -27,6 +28,17 @@ def basic_view(request):
return {'method': 'PUT', 'data': request.DATA} return {'method': 'PUT', 'data': request.DATA}
def sanitise_json_error(error_dict):
"""
Exact contents of JSON error messages depend on the installed version
of json.
"""
ret = copy.copy(error_dict)
chop = len('JSON parse error - No JSON object could be decoded')
ret['detail'] = ret['detail'][:chop]
return ret
class ClassBasedViewIntegrationTests(TestCase): class ClassBasedViewIntegrationTests(TestCase):
def setUp(self): def setUp(self):
self.view = BasicView.as_view() self.view = BasicView.as_view()
@ -38,7 +50,7 @@ class ClassBasedViewIntegrationTests(TestCase):
'detail': u'JSON parse error - No JSON object could be decoded' 'detail': u'JSON parse error - No JSON object could be decoded'
} }
self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEquals(response.data, expected) self.assertEquals(sanitise_json_error(response.data), expected)
def test_400_parse_error_tunneled_content(self): def test_400_parse_error_tunneled_content(self):
content = 'f00bar' content = 'f00bar'
@ -53,7 +65,7 @@ class ClassBasedViewIntegrationTests(TestCase):
'detail': u'JSON parse error - No JSON object could be decoded' 'detail': u'JSON parse error - No JSON object could be decoded'
} }
self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEquals(response.data, expected) self.assertEquals(sanitise_json_error(response.data), expected)
class FunctionBasedViewIntegrationTests(TestCase): class FunctionBasedViewIntegrationTests(TestCase):
@ -67,7 +79,7 @@ class FunctionBasedViewIntegrationTests(TestCase):
'detail': u'JSON parse error - No JSON object could be decoded' 'detail': u'JSON parse error - No JSON object could be decoded'
} }
self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEquals(response.data, expected) self.assertEquals(sanitise_json_error(response.data), expected)
def test_400_parse_error_tunneled_content(self): def test_400_parse_error_tunneled_content(self):
content = 'f00bar' content = 'f00bar'
@ -82,4 +94,4 @@ class FunctionBasedViewIntegrationTests(TestCase):
'detail': u'JSON parse error - No JSON object could be decoded' 'detail': u'JSON parse error - No JSON object could be decoded'
} }
self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEquals(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEquals(response.data, expected) self.assertEquals(sanitise_json_error(response.data), expected)