encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-24 08:14:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Force content_type inclusion in APIRequestFactory

Browse Source
This commit is contained in:
Ryan P Kilby 2017-08-30 21:36:05 -04:00
parent eb88687e28
commit 0ec915e623
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/request.py
View File

@ -303,7 +303,7 @@ class Request(object):
stream = None stream = None
if stream is None or media_type is 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) empty_data = QueryDict('', encoding=self._request._encoding)
else: else:
empty_data = {} empty_data = {}

9
rest_framework/test.py
View File

@ -227,6 +227,15 @@ class APIRequestFactory(DjangoRequestFactory):
data, content_type = self._encode_data(data, format, content_type) data, content_type = self._encode_data(data, format, content_type)
return self.generic('OPTIONS', path, data, content_type, **extra) 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'] = str(content_type)
return super(APIRequestFactory, self).generic(
method, path, data, content_type, secure, **extra)
def request(self, **kwargs): def request(self, **kwargs):
request = super(APIRequestFactory, self).request(**kwargs) request = super(APIRequestFactory, self).request(**kwargs)
request._dont_enforce_csrf_checks = not self.enforce_csrf_checks request._dont_enforce_csrf_checks = not self.enforce_csrf_checks

2
tests/test_testing.py
View File

@ -282,4 +282,4 @@ class TestAPIRequestFactory(TestCase):
data=None, data=None,
content_type='application/json', content_type='application/json',
) )
assert request.content_type == 'application/json' assert request.META['CONTENT_TYPE'] == 'application/json'