diff options
| author | Tom Christie | 2012-10-17 22:58:18 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-10-17 22:58:18 +0100 |
| commit | e126b615420fed12af58675cb4bb52e749b006bd (patch) | |
| tree | 4284ae586c094557153371c1dfd483906e6056b0 /rest_framework/tests/negotiation.py | |
| parent | bbd3728da615f688da6a5276c6a898990275f32c (diff) | |
| download | django-rest-framework-e126b615420fed12af58675cb4bb52e749b006bd.tar.bz2 | |
Negotiation API finalized. .select_renderers and .select_parsers
Diffstat (limited to 'rest_framework/tests/negotiation.py')
| -rw-r--r-- | rest_framework/tests/negotiation.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rest_framework/tests/negotiation.py b/rest_framework/tests/negotiation.py index d8265b43..e06354ea 100644 --- a/rest_framework/tests/negotiation.py +++ b/rest_framework/tests/negotiation.py @@ -18,20 +18,20 @@ class TestAcceptedMediaType(TestCase): self.renderers = [MockJSONRenderer(), MockHTMLRenderer()] self.negotiator = DefaultContentNegotiation() - def negotiate(self, request): - return self.negotiator.negotiate(request, self.renderers) + def select_renderer(self, request): + return self.negotiator.select_renderer(request, self.renderers) def test_client_without_accept_use_renderer(self): request = factory.get('/') - accepted_renderer, accepted_media_type = self.negotiate(request) + accepted_renderer, accepted_media_type = self.select_renderer(request) self.assertEquals(accepted_media_type, 'application/json') def test_client_underspecifies_accept_use_renderer(self): request = factory.get('/', HTTP_ACCEPT='*/*') - accepted_renderer, accepted_media_type = self.negotiate(request) + accepted_renderer, accepted_media_type = self.select_renderer(request) self.assertEquals(accepted_media_type, 'application/json') def test_client_overspecifies_accept_use_client(self): request = factory.get('/', HTTP_ACCEPT='application/json; indent=8') - accepted_renderer, accepted_media_type = self.negotiate(request) + accepted_renderer, accepted_media_type = self.select_renderer(request) self.assertEquals(accepted_media_type, 'application/json; indent=8') |
