aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/tests
diff options
context:
space:
mode:
authorTom Christie2012-09-06 13:49:15 +0100
committerTom Christie2012-09-06 13:49:15 +0100
commit1c78bf53dbc4f75cfdc240c72f4db9d2376cb9cb (patch)
treea481ddfe54444e8187de741db792fdbcb00ad712 /djangorestframework/tests
parentd52b4c5c6109c2d52125cb3dde16f9ce4004a98d (diff)
downloaddjango-rest-framework-1c78bf53dbc4f75cfdc240c72f4db9d2376cb9cb.tar.bz2
Refactoring some basics
Diffstat (limited to 'djangorestframework/tests')
-rw-r--r--djangorestframework/tests/renderers.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/djangorestframework/tests/renderers.py b/djangorestframework/tests/renderers.py
index 8b14038d..d8581540 100644
--- a/djangorestframework/tests/renderers.py
+++ b/djangorestframework/tests/renderers.py
@@ -246,9 +246,9 @@ class JSONPRendererTests(TestCase):
Test JSONP rendering with View JSON Renderer.
"""
resp = self.client.get('/jsonp/jsonrenderer',
- HTTP_ACCEPT='application/json-p')
+ HTTP_ACCEPT='application/javascript')
self.assertEquals(resp.status_code, 200)
- self.assertEquals(resp['Content-Type'], 'application/json-p')
+ self.assertEquals(resp['Content-Type'], 'application/javascript')
self.assertEquals(resp.content, 'callback(%s);' % _flat_repr)
def test_without_callback_without_json_renderer(self):
@@ -256,9 +256,9 @@ class JSONPRendererTests(TestCase):
Test JSONP rendering without View JSON Renderer.
"""
resp = self.client.get('/jsonp/nojsonrenderer',
- HTTP_ACCEPT='application/json-p')
+ HTTP_ACCEPT='application/javascript')
self.assertEquals(resp.status_code, 200)
- self.assertEquals(resp['Content-Type'], 'application/json-p')
+ self.assertEquals(resp['Content-Type'], 'application/javascript')
self.assertEquals(resp.content, 'callback(%s);' % _flat_repr)
def test_with_callback(self):
@@ -267,9 +267,9 @@ class JSONPRendererTests(TestCase):
"""
callback_func = 'myjsonpcallback'
resp = self.client.get('/jsonp/nojsonrenderer?callback=' + callback_func,
- HTTP_ACCEPT='application/json-p')
+ HTTP_ACCEPT='application/javascript')
self.assertEquals(resp.status_code, 200)
- self.assertEquals(resp['Content-Type'], 'application/json-p')
+ self.assertEquals(resp['Content-Type'], 'application/javascript')
self.assertEquals(resp.content, '%s(%s);' % (callback_func, _flat_repr))