From af8a362d6b513b71de45109b441f79ed7d1b103c Mon Sep 17 00:00:00 2001
From: Nicolas Delaby
Date: Mon, 7 Apr 2014 14:59:27 +0200
Subject: reset stored credentials when call client.logout()

---
 rest_framework/test.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'rest_framework/test.py')

diff --git a/rest_framework/test.py b/rest_framework/test.py
index df5a5b3b..79982cb0 100644
--- a/rest_framework/test.py
+++ b/rest_framework/test.py
@@ -154,6 +154,10 @@ class APIClient(APIRequestFactory, DjangoClient):
         kwargs.update(self._credentials)
         return super(APIClient, self).request(**kwargs)
 
+    def logout(self):
+        self._credentials = {}
+        return super(APIClient, self).logout()
+
 
 class APITransactionTestCase(testcases.TransactionTestCase):
     client_class = APIClient
-- 
cgit v1.2.3


From 6cb6bfae1b83c8682fa3c3d208c732c8ea49606e Mon Sep 17 00:00:00 2001
From: Danilo Bargen
Date: Fri, 30 May 2014 17:53:26 +0200
Subject: Always use specified content type in APIRequestFactory

If `content_type` is specified in the `APIRequestFactory`, always
include it in the request, even if data is empty.
---
 rest_framework/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/test.py')

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`.'
-- 
cgit v1.2.3


From bf09c32de8f9d528f83e9cb7a2773d1f4c9ab563 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 19 Aug 2014 13:28:07 +0100
Subject: Code linting and added runtests.py

---
 rest_framework/test.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'rest_framework/test.py')

diff --git a/rest_framework/test.py b/rest_framework/test.py
index d4ec50a0..9242cf7c 100644
--- a/rest_framework/test.py
+++ b/rest_framework/test.py
@@ -49,9 +49,10 @@ class APIRequestFactory(DjangoRequestFactory):
         else:
             format = format or self.default_format
 
-            assert format in self.renderer_classes, ("Invalid format '{0}'. "
-                "Available formats are {1}.  Set TEST_REQUEST_RENDERER_CLASSES "
-                "to enable extra request formats.".format(
+            assert format in self.renderer_classes, (
+                "Invalid format '{0}'. Available formats are {1}. "
+                "Set TEST_REQUEST_RENDERER_CLASSES to enable "
+                "extra request formats.".format(
                     format,
                     ', '.join(["'" + fmt + "'" for fmt in self.renderer_classes.keys()])
                 )
-- 
cgit v1.2.3


From 63d02dbea855a060ec4cdb194497188e2f40cb66 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 19 Aug 2014 17:06:55 +0100
Subject: Drop six from compat. 1.4.2 is now the lowest supported version.

---
 rest_framework/test.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework/test.py')

diff --git a/rest_framework/test.py b/rest_framework/test.py
index 9242cf7c..f89a6dcd 100644
--- a/rest_framework/test.py
+++ b/rest_framework/test.py
@@ -8,10 +8,11 @@ from django.conf import settings
 from django.test.client import Client as DjangoClient
 from django.test.client import ClientHandler
 from django.test import testcases
+from django.utils import six
 from django.utils.http import urlencode
 from rest_framework.settings import api_settings
 from rest_framework.compat import RequestFactory as DjangoRequestFactory
-from rest_framework.compat import force_bytes_or_smart_bytes, six
+from rest_framework.compat import force_bytes_or_smart_bytes
 
 
 def force_authenticate(request, user=None, token=None):
-- 
cgit v1.2.3