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

Merge 626c56bff4 into c22e61d3c3

Browse Source
This commit is contained in:
Ross Crawford-d'Heureuse 2017-05-04 00:57:13 +00:00 committed by GitHub
commit 6d788edb7a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/test.py
View File

@ -252,8 +252,13 @@ class ForceAuthClientHandler(ClientHandler):
class APIClient(APIRequestFactory, DjangoClient):
request = None
def __init__(self, enforce_csrf_checks=False, **defaults):
self.request = defaults.get('request') if 'request' in defaults else None
super(APIClient, self).__init__(**defaults)
self.handler = ForceAuthClientHandler(enforce_csrf_checks)
self._credentials = {}
@ -274,6 +279,9 @@ class APIClient(APIRequestFactory, DjangoClient):
self.logout() # Also clear any possible session info if required
def request(self, **kwargs):
if self.request is not None:
return self.request
# Ensure that any credentials set get added to every request.
kwargs.update(self._credentials)
return super(APIClient, self).request(**kwargs)