Ticket #27398: assertRedirects.patch

django/test/testcases.py

@@ -9 +9 @@
 from copy import copy
 from functools import wraps
 from unittest.util import safe_repr
-from urllib.parse import unquote, urljoin, urlparse, urlsplit
+from urllib.parse import (
+    parse_qsl, unquote, urlencode, urljoin, urlparse, urlsplit, urlunparse,
+)
 from urllib.request import url2pathname
 
 from django.apps import apps
@@ -240 +242 @@
 
     def assertRedirects(self, response, expected_url, status_code=302,
                         target_status_code=200, msg_prefix='',
-                        fetch_redirect_response=True):
+                        fetch_redirect_response=True, strict_query_order=False):
         """
         Assert that a response redirected to a specific URL and that the
         redirect URL can be loaded.
@@ -248 +250 @@
         Won't work for external links since it uses the test client to do a
         request (use fetch_redirect_response=False to check such links without
         fetching them).
+
+        By default, the order of the querystring part of the url doesn't matter,
+        if you you rely on the exact ordering of the querystring, use
+        strict_query_order=True.
         """
         if msg_prefix:
             msg_prefix += ": "
@@ -313 +319 @@
                     % (path, redirect_response.status_code, target_status_code)
                 )
 
+        if not strict_query_order:
+            def normalize(url):
+                scheme, netloc, path, params, query, fragment = urlparse(url)
+                query_parts = sorted(parse_qsl(query), key=lambda o: o[0])
+                return urlunparse((scheme, netloc, path, params, urlencode(query_parts), fragment))
+
+            url, expected_url = normalize(url), normalize(expected_url)
+
         self.assertEqual(
             url, expected_url,
             msg_prefix + "Response redirected to '%s', expected '%s'" % (url, expected_url)

tests/test_client/tests.py

@@ -167 +167 @@
         response = self.client.get('/redirect_view/', {'var': 'value'})
         self.assertRedirects(response, '/get_view/?var=value')
 
+    def test_redirect_with_query_ordering(self):
+        "GET a URL with two GET paramameters allow both querystring orderings"
+        response = self.client.get('/redirect_view/', {'var': 'value', 'foo': 'bar'})
+        self.assertRedirects(response, '/get_view/?var=value&foo=bar')
+        self.assertRedirects(response, '/get_view/?foo=bar&var=value')
+
+        with self.assertRaises(AssertionError):
+            self.assertRedirects(response, '/get_view/?foo=bar&var=value', strict_query_order=True)
+
     def test_permanent_redirect(self):
         "GET a URL that redirects permanently elsewhere"
         response = self.client.get('/permanent_redirect_view/')