Fixed #27999 -- Added test client support for HTTP 307 and 308 redirects.

3 files changed, 61 insertions, 0 deletions

diff --git a/tests/test_client/tests.py b/tests/test_client/tests.py
index f7d32aa9cd..2643a279b1 100644
--- a/tests/test_client/tests.py
+++ b/tests/test_client/tests.py
@@ -19,6 +19,7 @@ testing against the contexts and templates produced by a view,
 rather than the HTML rendered to the end-user.
 
 """
+import itertools
 import tempfile
 
 from django.contrib.auth.models import User
@@ -202,6 +203,39 @@ class ClientTest(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.request['PATH_INFO'], '/accounts/login/')
 
+    def test_follow_307_and_308_redirect(self):
+        """
+        A 307 or 308 redirect preserves the request method after the redirect.
+        """
+        methods = ('get', 'post', 'head', 'options', 'put', 'patch', 'delete', 'trace')
+        codes = (307, 308)
+        for method, code in itertools.product(methods, codes):
+            with self.subTest(method=method, code=code):
+                req_method = getattr(self.client, method)
+                response = req_method('/redirect_view_%s/' % code, data={'value': 'test'}, follow=True)
+                self.assertEqual(response.status_code, 200)
+                self.assertEqual(response.request['PATH_INFO'], '/post_view/')
+                self.assertEqual(response.request['REQUEST_METHOD'], method.upper())
+
+    def test_follow_307_and_308_preserves_post_data(self):
+        for code in (307, 308):
+            with self.subTest(code=code):
+                response = self.client.post('/redirect_view_%s/' % code, data={'value': 'test'}, follow=True)
+                self.assertContains(response, 'test is the value')
+
+    def test_follow_307_and_308_preserves_put_body(self):
+        for code in (307, 308):
+            with self.subTest(code=code):
+                response = self.client.put('/redirect_view_%s/?to=/put_view/' % code, data='a=b', follow=True)
+                self.assertContains(response, 'a=b is the body')
+
+    def test_follow_307_and_308_preserves_get_params(self):
+        data = {'var': 30, 'to': '/get_view/'}
+        for code in (307, 308):
+            with self.subTest(code=code):
+                response = self.client.get('/redirect_view_%s/' % code, data=data, follow=True)
+                self.assertContains(response, '30 is the value')
+
     def test_redirect_http(self):
         "GET a URL that redirects to an http URI"
         response = self.client.get('/http_redirect_view/', follow=True)
diff --git a/tests/test_client/urls.py b/tests/test_client/urls.py
index 40ca384751..749426f2c4 100644
--- a/tests/test_client/urls.py
+++ b/tests/test_client/urls.py
@@ -8,10 +8,13 @@ urlpatterns = [
     url(r'^upload_view/$', views.upload_view, name='upload_view'),
     url(r'^get_view/$', views.get_view, name='get_view'),
     url(r'^post_view/$', views.post_view),
+    url(r'^put_view/$', views.put_view),
     url(r'^trace_view/$', views.trace_view),
     url(r'^header_view/$', views.view_with_header),
     url(r'^raw_post_view/$', views.raw_post_view),
     url(r'^redirect_view/$', views.redirect_view),
+    url(r'^redirect_view_307/$', views.method_saving_307_redirect_view),
+    url(r'^redirect_view_308/$', views.method_saving_308_redirect_view),
     url(r'^secure_view/$', views.view_with_secure),
     url(r'^permanent_redirect_view/$', RedirectView.as_view(url='/get_view/', permanent=True)),
     url(r'^temporary_redirect_view/$', RedirectView.as_view(url='/get_view/', permanent=False)),
diff --git a/tests/test_client/views.py b/tests/test_client/views.py
index 3387008d66..80daa9bcad 100644
--- a/tests/test_client/views.py
+++ b/tests/test_client/views.py
@@ -49,6 +49,16 @@ def trace_view(request):
         return HttpResponse(t.render(c))
 
 
+def put_view(request):
+    if request.method == 'PUT':
+        t = Template('Data received: {{ data }} is the body.', name='PUT Template')
+        c = Context({'data': request.body.decode()})
+    else:
+        t = Template('Viewing GET page.', name='Empty GET Template')
+        c = Context()
+    return HttpResponse(t.render(c))
+
+
 def post_view(request):
     """A view that expects a POST, and returns a different template depending
     on whether any POST data is available
@@ -99,6 +109,20 @@ def redirect_view(request):
     return HttpResponseRedirect('/get_view/' + query)
 
 
+def _post_view_redirect(request, status_code):
+    """Redirect to /post_view/ using the status code."""
+    redirect_to = request.GET.get('to', '/post_view/')
+    return HttpResponseRedirect(redirect_to, status=status_code)
+
+
+def method_saving_307_redirect_view(request):
+    return _post_view_redirect(request, 307)
+
+
+def method_saving_308_redirect_view(request):
+    return _post_view_redirect(request, 308)
+
+
 def view_with_secure(request):
     "A view that indicates if the request was secure"
     response = HttpResponse()