Ticket #4968: 4968.diff

django/test/testcases.py

@@ -1 +1 @@
 import re, unittest
-from urlparse import urlparse
+from urlparse import urlsplit
+from django.http import QueryDict
 from django.db import transaction
 from django.core import management, mail
 from django.db.models import get_apps
@@ -57 +58 @@
         self._pre_setup()
         super(TestCase, self).__call__(result)
 
-    def assertRedirects(self, response, expected_path, status_code=302, target_status_code=200):
+    def assertRedirects(self, response, expected_url, status_code=302, target_status_code=200):
         """Assert that a response redirected to a specific URL, and that the
         redirect URL can be loaded.
         
+        Note that assertRedirects won't work for external links since it uses 
+        TestClient to do a request.
         """
         self.assertEqual(response.status_code, status_code, 
             "Response didn't redirect as expected: Response code was %d (expected %d)" % 
                 (response.status_code, status_code))
-        scheme, netloc, path, params, query, fragment = urlparse(response['Location'])
-        self.assertEqual(path, expected_path, 
-            "Response redirected to '%s', expected '%s'" % (path, expected_path))
-        redirect_response = self.client.get(path)
+        scheme, netloc, path, query, fragment = urlsplit(response['Location'])
+        url = path
+        if query:
+            url += '?' + query
+        if fragment:
+            url += '#' + fragment
+        self.assertEqual(url, expected_url, 
+            "Response redirected to '%s', expected '%s'" % (url, expected_url))
+        
+        redirect_response = self.client.get(path, QueryDict(query))
         self.assertEqual(redirect_response.status_code, target_status_code, 
             "Couldn't retrieve redirection page '%s': response code was %d (expected %d)" % 
                 (path, redirect_response.status_code, target_status_code))

tests/modeltests/test_client/views.py

@@ -48 +48 @@
 
 def redirect_view(request):
     "A view that redirects all requests to the GET view"
-    return HttpResponseRedirect('/test_client/get_view/')
+    if request.GET:
+        from urllib import urlencode
+        query = '?' + urlencode(request.GET, True)
+    else:
+        query = ''
+    return HttpResponseRedirect('/test_client/get_view/' + query)
 
 def double_redirect_view(request):
     "A view that redirects all requests to a redirection view"

tests/modeltests/test_client/models.py

@@ -86 +86 @@
         
         # Check that the response was a 302 (redirect)
         self.assertRedirects(response, '/test_client/get_view/')
+    
+    def test_redirect_with_query(self):
+        "GET a URL that redirects with given GET parameters"
+        response = self.client.get('/test_client/redirect_view/', {'var': 'value'})
+        
+        # Check if parameters are intact
+        self.assertRedirects(response, '/test_client/get_view/?var=value')
 
     def test_permanent_redirect(self):
         "GET a URL that redirects permanently elsewhere"
@@ -224 +231 @@
         
         # Get the page without logging in. Should result in 302.
         response = self.client.get('/test_client/login_protected_view/')
-        self.assertRedirects(response, '/accounts/login/')
+        self.assertRedirects(response, '/accounts/login/?next=/test_client/login_protected_view/')
         
         # Log in
         self.client.login(username='testclient', password='password')

tests/regressiontests/test_client_regress/models.py

@@ -112 +112 @@
             self.assertRedirects(response, '/test_client/get_view/')
         except AssertionError, e:
             self.assertEquals(str(e), "Response didn't redirect as expected: Response code was 301 (expected 302)")
+    
+    def test_lost_query(self):
+        "An assertion is raised if the redirect location doesn't preserve GET parameters"
+        response = self.client.get('/test_client/redirect_view/', {'var': 'value'})
+        try:
+            self.assertRedirects(response, '/test_client/get_view/')
+        except AssertionError, e:
+            self.assertEquals(str(e), "Response redirected to '/test_client/get_view/?var=value', expected '/test_client/get_view/'")
 
     def test_incorrect_target(self):
         "An assertion is raised if the response redirects to another target"