[1.0.X] Fixed #10585: comment redirects built from the `next` parameter now work correctly when `next` already contains a query string. Backport of r10424 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10425 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/regressiontests/comment_tests/tests/comment_view_tests.py b/tests/regressiontests/comment_tests/tests/comment_view_tests.py
index 0c975116ef..9183888d5c 100644
--- a/tests/regressiontests/comment_tests/tests/comment_view_tests.py
+++ b/tests/regressiontests/comment_tests/tests/comment_view_tests.py
@@ -196,3 +196,16 @@ class CommentViewTests(CommentTestCase):
         self.assertTemplateUsed(response, "comments/posted.html")
         self.assertEqual(response.context[0]["comment"], Comment.objects.get(pk=1))
 
+    def testCommentNextWithQueryString(self):
+        """
+        The `next` key needs to handle already having a query string (#10585)
+        """
+        a = Article.objects.get(pk=1)
+        data = self.getValidData(a)
+        data["next"] = "/somewhere/else/?foo=bar"
+        data["comment"] = "This is another comment"
+        response = self.client.post("/post/", data)
+        location = response["Location"]        
+        match = re.search(r"^http://testserver/somewhere/else/\?foo=bar&c=\d+$", location)
+        self.failUnless(match != None, "Unexpected redirect location: %s" % location)
+        
\ No newline at end of file