aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/negotiation.py
diff options
context:
space:
mode:
authorTom Christie2012-10-05 10:33:44 +0100
committerTom Christie2012-10-05 10:33:44 +0100
commited281be3fb3f49ffee69f08aeb95f116528dc833 (patch)
tree4bd7567629bbe3615f61d6dd380d3d3bd8548d2e /rest_framework/tests/negotiation.py
parentd07dc77e91c1f99b47915b3cef30b565f2618e82 (diff)
downloaddjango-rest-framework-ed281be3fb3f49ffee69f08aeb95f116528dc833.tar.bz2
User .accepted_renderer, .accepted_media_type
Diffstat (limited to 'rest_framework/tests/negotiation.py')
-rw-r--r--rest_framework/tests/negotiation.py23
1 files changed, 1 insertions, 22 deletions
diff --git a/rest_framework/tests/negotiation.py b/rest_framework/tests/negotiation.py
index dd9f6a76..d8265b43 100644
--- a/rest_framework/tests/negotiation.py
+++ b/rest_framework/tests/negotiation.py
@@ -1,8 +1,6 @@
from django.test import TestCase
from django.test.client import RequestFactory
-from rest_framework.decorators import api_view, renderer_classes
from rest_framework.negotiation import DefaultContentNegotiation
-from rest_framework.response import Response
factory = RequestFactory()
@@ -10,26 +8,14 @@ factory = RequestFactory()
class MockJSONRenderer(object):
media_type = 'application/json'
- def __init__(self, view):
- pass
-
class MockHTMLRenderer(object):
media_type = 'text/html'
- def __init__(self, view):
- pass
-
-
-@api_view(('GET',))
-@renderer_classes((MockJSONRenderer, MockHTMLRenderer))
-def example(request):
- return Response()
-
class TestAcceptedMediaType(TestCase):
def setUp(self):
- self.renderers = [MockJSONRenderer(None), MockHTMLRenderer(None)]
+ self.renderers = [MockJSONRenderer(), MockHTMLRenderer()]
self.negotiator = DefaultContentNegotiation()
def negotiate(self, request):
@@ -49,10 +35,3 @@ class TestAcceptedMediaType(TestCase):
request = factory.get('/', HTTP_ACCEPT='application/json; indent=8')
accepted_renderer, accepted_media_type = self.negotiate(request)
self.assertEquals(accepted_media_type, 'application/json; indent=8')
-
-
-class IntegrationTests(TestCase):
- def test_accepted_negotiation_set_on_request(self):
- request = factory.get('/', HTTP_ACCEPT='*/*')
- response = example(request)
- self.assertEquals(response.accepted_media_type, 'application/json')