encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-06 05:20:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 4a869b755b into 33cfc2e486

Browse Source
This commit is contained in:
Dustin Farris 2015-02-03 14:14:44 +00:00
commit 024aa5462e
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/models.py
View File

@ -15,6 +15,7 @@ class RESTFrameworkModel(models.Model):
class BasicModel(RESTFrameworkModel):
text = models.CharField(max_length=100, verbose_name=_("Text comes here"), help_text=_("Text description."))
number = models.IntegerField(null=True, blank=True)
class BaseFilterableItem(RESTFrameworkModel):

31
tests/test_generics.py
View File

@ -80,7 +80,7 @@ class TestRootView(TestCase):
BasicModel(text=item).save()
self.objects = BasicModel.objects
self.data = [
{'id': obj.id, 'text': obj.text}
{'id': obj.id, 'text': obj.text, 'number': obj.number}
for obj in self.objects.all()
]
self.view = RootView.as_view()
@ -104,10 +104,19 @@ class TestRootView(TestCase):
with self.assertNumQueries(1):
response = self.view(request).render()
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(response.data, {'id': 4, 'text': 'foobar'})
self.assertEqual(response.data, {'id': 4, 'text': 'foobar', 'number': None})
created = self.objects.get(id=4)
self.assertEqual(created.text, 'foobar')
def test_post_null_integer_as_form_data(self):
"""
None should resolve when a model's field has null=True.
"""
data = {'text': 'foobar', 'number': None}
request = factory.post('/', data)
response = self.view(request).render()
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
def test_put_root_view(self):
"""
PUT requests to ListCreateAPIView should not be allowed
@ -138,7 +147,7 @@ class TestRootView(TestCase):
with self.assertNumQueries(1):
response = self.view(request).render()
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(response.data, {'id': 4, 'text': 'foobar'})
self.assertEqual(response.data, {'id': 4, 'text': 'foobar', 'number': None})
created = self.objects.get(id=4)
self.assertEqual(created.text, 'foobar')
@ -156,7 +165,7 @@ class TestInstanceView(TestCase):
BasicModel(text=item).save()
self.objects = BasicModel.objects.exclude(text='filtered out')
self.data = [
{'id': obj.id, 'text': obj.text}
{'id': obj.id, 'text': obj.text, 'number': obj.number}
for obj in self.objects.all()
]
self.view = InstanceView.as_view()
@ -192,7 +201,7 @@ class TestInstanceView(TestCase):
with self.assertNumQueries(EXPECTED_QUERIES_FOR_PUT):
response = self.view(request, pk='1').render()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(dict(response.data), {'id': 1, 'text': 'foobar'})
self.assertEqual(dict(response.data), {'id': 1, 'text': 'foobar', 'number': None})
updated = self.objects.get(id=1)
self.assertEqual(updated.text, 'foobar')
@ -206,7 +215,7 @@ class TestInstanceView(TestCase):
with self.assertNumQueries(EXPECTED_QUERIES_FOR_PUT):
response = self.view(request, pk=1).render()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data, {'id': 1, 'text': 'foobar'})
self.assertEqual(response.data, {'id': 1, 'text': 'foobar', 'number': None})
updated = self.objects.get(id=1)
self.assertEqual(updated.text, 'foobar')
@ -241,7 +250,7 @@ class TestInstanceView(TestCase):
with self.assertNumQueries(EXPECTED_QUERIES_FOR_PUT):
response = self.view(request, pk=1).render()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data, {'id': 1, 'text': 'foobar'})
self.assertEqual(response.data, {'id': 1, 'text': 'foobar', 'number': None})
updated = self.objects.get(id=1)
self.assertEqual(updated.text, 'foobar')
@ -314,7 +323,7 @@ class TestOverriddenGetObject(TestCase):
BasicModel(text=item).save()
self.objects = BasicModel.objects
self.data = [
{'id': obj.id, 'text': obj.text}
{'id': obj.id, 'text': obj.text, 'number': obj.number}
for obj in self.objects.all()
]
@ -450,7 +459,7 @@ class TestFilterBackendAppliedToViews(TestCase):
BasicModel(text=item).save()
self.objects = BasicModel.objects
self.data = [
{'id': obj.id, 'text': obj.text}
{'id': obj.id, 'text': obj.text, 'number': obj.number}
for obj in self.objects.all()
]
@ -463,7 +472,7 @@ class TestFilterBackendAppliedToViews(TestCase):
response = root_view(request).render()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data), 1)
self.assertEqual(response.data, [{'id': 1, 'text': 'foo'}])
self.assertEqual(response.data, [{'id': 1, 'text': 'foo', 'number': None}])
def test_get_root_view_filters_out_all_models_with_exclusive_filter_backend(self):
"""
@ -493,7 +502,7 @@ class TestFilterBackendAppliedToViews(TestCase):
request = factory.get('/1')
response = instance_view(request, pk=1).render()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data, {'id': 1, 'text': 'foo'})
self.assertEqual(response.data, {'id': 1, 'text': 'foo', 'number': None})
def test_dynamic_serializer_form_in_browsable_api(self):
"""

8
tests/test_pagination.py
View File

@ -82,7 +82,7 @@ class IntegrationTestPagination(TestCase):
BasicModel(text=char * 3).save()
self.objects = BasicModel.objects
self.data = [
{'id': obj.id, 'text': obj.text}
{'id': obj.id, 'text': obj.text, 'number': obj.number}
for obj in self.objects.all()
]
self.view = RootView.as_view()
@ -290,7 +290,7 @@ class TestUnpaginated(TestCase):
BasicModel(text=i).save()
self.objects = BasicModel.objects
self.data = [
{'id': obj.id, 'text': obj.text}
{'id': obj.id, 'text': obj.text, 'number': obj.number}
for obj in self.objects.all()
]
self.view = DefaultPageSizeKwargView.as_view()
@ -318,7 +318,7 @@ class TestCustomPaginateByParam(TestCase):
BasicModel(text=i).save()
self.objects = BasicModel.objects
self.data = [
{'id': obj.id, 'text': obj.text}
{'id': obj.id, 'text': obj.text, 'number': obj.number}
for obj in self.objects.all()
]
self.view = PaginateByParamView.as_view()
@ -355,7 +355,7 @@ class TestMaxPaginateByParam(TestCase):
BasicModel(text=i).save()
self.objects = BasicModel.objects
self.data = [
{'id': obj.id, 'text': obj.text}
{'id': obj.id, 'text': obj.text, 'number': obj.number}
for obj in self.objects.all()
]
self.view = MaxPaginateByView.as_view()