Force content_type inclusion in APIRequestFactory

Ryan P Kilby · Ryan P Kilby · commit c9b3fd6a4f32 · 2017-08-30T21:47:15.000-04:00
diff --git a/rest_framework/request.py b/rest_framework/request.py
@@ -303,7 +303,7 @@ def _parse(self):
             stream = None
 
         if stream is None or media_type is None:
-            if media_type and not is_form_media_type(media_type):
+            if media_type and is_form_media_type(media_type):
                 empty_data = QueryDict('', encoding=self._request._encoding)
             else:
                 empty_data = {}
diff --git a/rest_framework/test.py b/rest_framework/test.py
@@ -227,6 +227,15 @@ def options(self, path, data=None, format=None, content_type=None, **extra):
         data, content_type = self._encode_data(data, format, content_type)
         return self.generic('OPTIONS', path, data, content_type, **extra)
 
+    def generic(self, method, path, data='',
+                content_type='application/octet-stream', secure=False, **extra):
+        # Include the CONTENT_TYPE, regardless of whether or not data is empty.
+        if content_type is not None:
+            extra['CONTENT_TYPE'] = content_type
+
+        return super(APIRequestFactory, self).generic(
+            method, path, data, content_type, secure, **extra)
+
     def request(self, **kwargs):
         request = super(APIRequestFactory, self).request(**kwargs)
         request._dont_enforce_csrf_checks = not self.enforce_csrf_checks
diff --git a/tests/test_testing.py b/tests/test_testing.py
@@ -282,4 +282,4 @@ def test_empty_request_content_type(self):
             data=None,
             content_type='application/json',
         )
-        assert request.content_type == 'application/json'
+        assert request.META['CONTENT_TYPE'] == 'application/json'

Original file line number	Diff line number	Diff line change
`@@ -282,4 +282,4 @@ def test_empty_request_content_type(self):`
`282`	`282`	`data=None,`
`283`	`283`	`content_type='application/json',`
`284`	`284`	`)`
`285`		`- assert request.content_type == 'application/json'`
	`285`	`+ assert request.META['CONTENT_TYPE'] == 'application/json'`