diff options
| author | Tom Christie | 2012-09-16 14:02:18 -0700 |
|---|---|---|
| committer | Tom Christie | 2012-09-16 14:02:18 -0700 |
| commit | 549ebdc1c67c20bdff39a2f4a59012dd010213a1 (patch) | |
| tree | ef7b3626e602ecaa1761cb4e780501f0b8db9463 /djangorestframework/tests/renderers.py | |
| parent | b7b8cd11b1aad3fcf4bad221d164bb55e0bf5859 (diff) | |
| parent | d8ede0355c32455989ca5f955d555ffaf827b296 (diff) | |
| download | django-rest-framework-549ebdc1c67c20bdff39a2f4a59012dd010213a1.tar.bz2 | |
Merge pull request #263 from tomchristie/decouple-conneg
Content negotiation logic out of response and into View
Diffstat (limited to 'djangorestframework/tests/renderers.py')
| -rw-r--r-- | djangorestframework/tests/renderers.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/djangorestframework/tests/renderers.py b/djangorestframework/tests/renderers.py index 718c903f..650798de 100644 --- a/djangorestframework/tests/renderers.py +++ b/djangorestframework/tests/renderers.py @@ -169,15 +169,6 @@ class RendererEndToEndTests(TestCase): self.assertEquals(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT)) self.assertEquals(resp.status_code, DUMMYSTATUS) - def test_conflicting_format_query_and_accept_ignores_accept(self): - """If a 'format' query is specified that does not match the Accept - header, we should only honor the 'format' query string.""" - resp = self.client.get('/?format=%s' % RendererB.format, - HTTP_ACCEPT='dummy') - self.assertEquals(resp['Content-Type'], RendererB.media_type) - self.assertEquals(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT)) - self.assertEquals(resp.status_code, DUMMYSTATUS) - _flat_repr = '{"foo": ["bar", "baz"]}' _indented_repr = '{\n "foo": [\n "bar",\n "baz"\n ]\n}' |