encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-24 00:04:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add more tests for generic views

Browse Source
This commit is contained in:
Tom Christie 2012-09-28 16:41:35 +01:00
parent 0853316545
commit 224bc027cd
2 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
rest_framework/tests/generics.py
View File

@ -9,10 +9,16 @@ factory = RequestFactory()
class RootView(generics.RootAPIView): class RootView(generics.RootAPIView):
"""
Example description for OPTIONS.
"""
model = BasicModel model = BasicModel
class InstanceView(generics.InstanceAPIView): class InstanceView(generics.InstanceAPIView):
"""
Example description for OPTIONS.
"""
model = BasicModel model = BasicModel
@ -60,7 +66,7 @@ class TestRootView(TestCase):
request = factory.put('/', json.dumps(content), content_type='application/json') request = factory.put('/', json.dumps(content), content_type='application/json')
response = self.view(request).render() response = self.view(request).render()
self.assertEquals(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) self.assertEquals(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
self.assertEquals(response.content, '{"detail": "Method \'PUT\' not allowed."}') self.assertEquals(response.data, {"detail": "Method 'PUT' not allowed."})
def test_delete_root_view(self): def test_delete_root_view(self):
""" """
@ -69,7 +75,29 @@ class TestRootView(TestCase):
request = factory.delete('/') request = factory.delete('/')
response = self.view(request).render() response = self.view(request).render()
self.assertEquals(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) self.assertEquals(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
self.assertEquals(response.content, '{"detail": "Method \'DELETE\' not allowed."}') self.assertEquals(response.data, {"detail": "Method 'DELETE' not allowed."})
def test_options_root_view(self):
"""
OPTIONS requests to RootAPIView should return metadata
"""
request = factory.options('/')
response = self.view(request).render()
expected = {
'parses': [
'application/json',
'application/x-www-form-urlencoded',
'multipart/form-data'
],
'renders': [
'application/json',
'text/html'
],
'name': 'Root',
'description': 'Example description for OPTIONS.'
}
self.assertEquals(response.status_code, status.HTTP_200_OK)
self.assertEquals(response.data, expected)
class TestInstanceView(TestCase): class TestInstanceView(TestCase):
@ -104,7 +132,7 @@ class TestInstanceView(TestCase):
request = factory.post('/', json.dumps(content), content_type='application/json') request = factory.post('/', json.dumps(content), content_type='application/json')
response = self.view(request).render() response = self.view(request).render()
self.assertEquals(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) self.assertEquals(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
self.assertEquals(response.content, '{"detail": "Method \'POST\' not allowed."}') self.assertEquals(response.data, {"detail": "Method 'POST' not allowed."})
def test_put_instance_view(self): def test_put_instance_view(self):
""" """
@ -128,3 +156,25 @@ class TestInstanceView(TestCase):
self.assertEquals(response.content, '') self.assertEquals(response.content, '')
ids = [obj.id for obj in self.objects.all()] ids = [obj.id for obj in self.objects.all()]
self.assertEquals(ids, [2, 3]) self.assertEquals(ids, [2, 3])
def test_options_instance_view(self):
"""
OPTIONS requests to InstanceAPIView should return metadata
"""
request = factory.options('/')
response = self.view(request).render()
expected = {
'parses': [
'application/json',
'application/x-www-form-urlencoded',
'multipart/form-data'
],
'renders': [
'application/json',
'text/html'
],
'name': 'Instance',
'description': 'Example description for OPTIONS.'
}
self.assertEquals(response.status_code, status.HTTP_200_OK)
self.assertEquals(response.data, expected)

3
rest_framework/views.py
View File

@ -39,7 +39,8 @@ def _remove_leading_indent(content):
# unindent the content if needed # unindent the content if needed
if whitespace_counts: if whitespace_counts:
whitespace_pattern = '^' + (' ' * min(whitespace_counts)) whitespace_pattern = '^' + (' ' * min(whitespace_counts))
return re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content)
content = content.strip('\n')
return content return content