aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-05-30 19:31:06 +0100
committerTom Christie2014-05-30 19:31:06 +0100
commit12394c9cacef0c92ef5b9d31836612e52a26e57a (patch)
tree43f47b9f53b5f6a3150a5032f491e3fa50b083e4
parenta7ff51118f8c8d696219ea7723b283a0ee680457 (diff)
parent6cb6bfae1b83c8682fa3c3d208c732c8ea49606e (diff)
downloaddjango-rest-framework-12394c9cacef0c92ef5b9d31836612e52a26e57a.tar.bz2
Merge pull request #1608 from dbrgn/test_client_contenttype
Always use specified content type in APIRequestFactory
-rw-r--r--rest_framework/test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/test.py b/rest_framework/test.py
index df5a5b3b..284bcee0 100644
--- a/rest_framework/test.py
+++ b/rest_framework/test.py
@@ -36,7 +36,7 @@ class APIRequestFactory(DjangoRequestFactory):
"""
if not data:
- return ('', None)
+ return ('', content_type)
assert format is None or content_type is None, (
'You may not set both `format` and `content_type`.'