Updated assertRedirects compatibility wrapper

@@ -94,11 +94,9 @@ class CommentTestCase(TestCase):
 
 
     def assertRedirects(self, response, expected_url, **kwargs):
     def assertRedirects(self, response, expected_url, **kwargs):
         """
         """
-        Wrapper for assertRedirects to handle Django pre-1.7.
+        Wrapper for assertRedirects to handle Django pre-1.9.
         """
         """
-        if VERSION >= (1, 7):
-            kwargs['fetch_redirect_response'] = False
-            return super(CommentTestCase, self).assertRedirects(
-                response, expected_url, **kwargs)
-        else:
-            self.assertEqual(response["Location"], expected_url)
+        if VERSION >= (1, 9) and expected_url.startswith('http://testserver'):
+            expected_url = expected_url[len('http://testserver'):]
+        return super(CommentTestCase, self).assertRedirects(
+            response, expected_url, **kwargs)

@@ -41,7 +41,7 @@ class FlagViewTests(CommentTestCase):
         self.client.login(username="normaluser", password="normaluser")
         self.client.login(username="normaluser", password="normaluser")
         response = self.client.post("/flag/%d/" % pk, {'next': "/go/here/"})
         response = self.client.post("/flag/%d/" % pk, {'next': "/go/here/"})
         self.assertRedirects(response,
         self.assertRedirects(response,
-            "http://testserver/go/here/?c=%d" % pk)
+            "http://testserver/go/here/?c=%d" % pk, fetch_redirect_response=False)
 
 
     def testFlagPostUnsafeNext(self):
     def testFlagPostUnsafeNext(self):
         """
         """
@@ -68,9 +68,13 @@ class FlagViewTests(CommentTestCase):
         comments = self.createSomeComments()
         comments = self.createSomeComments()
         pk = comments[0].pk
         pk = comments[0].pk
         response = self.client.get("/flag/%d/" % pk)
         response = self.client.get("/flag/%d/" % pk)
-        self.assertRedirects(response, "http://testserver/accounts/login/?next=/flag/%d/" % pk)
+        self.assertRedirects(response,
+            "http://testserver/accounts/login/?next=/flag/%d/" % pk,
+            fetch_redirect_response=False)
         response = self.client.post("/flag/%d/" % pk)
         response = self.client.post("/flag/%d/" % pk)
-        self.assertRedirects(response, "http://testserver/accounts/login/?next=/flag/%d/" % pk)
+        self.assertRedirects(response,
+            "http://testserver/accounts/login/?next=/flag/%d/" % pk,
+            fetch_redirect_response=False)
 
 
     def testFlaggedView(self):
     def testFlaggedView(self):
         comments = self.createSomeComments()
         comments = self.createSomeComments()
@@ -113,7 +117,9 @@ class DeleteViewTests(CommentTestCase):
         pk = comments[0].pk
         pk = comments[0].pk
         self.client.login(username="normaluser", password="normaluser")
         self.client.login(username="normaluser", password="normaluser")
         response = self.client.get("/delete/%d/" % pk)
         response = self.client.get("/delete/%d/" % pk)
-        self.assertRedirects(response, "http://testserver/accounts/login/?next=/delete/%d/" % pk)
+        self.assertRedirects(response,
+            "http://testserver/accounts/login/?next=/delete/%d/" % pk,
+            fetch_redirect_response=False)
 
 
         makeModerator("normaluser")
         makeModerator("normaluser")
         response = self.client.get("/delete/%d/" % pk)
         response = self.client.get("/delete/%d/" % pk)
@@ -142,7 +148,7 @@ class DeleteViewTests(CommentTestCase):
         self.client.login(username="normaluser", password="normaluser")
         self.client.login(username="normaluser", password="normaluser")
         response = self.client.post("/delete/%d/" % pk, {'next': "/go/here/"})
         response = self.client.post("/delete/%d/" % pk, {'next': "/go/here/"})
         self.assertRedirects(response,
         self.assertRedirects(response,
-            "http://testserver/go/here/?c=%d" % pk)
+            "http://testserver/go/here/?c=%d" % pk, fetch_redirect_response=False)
 
 
     def testDeletePostUnsafeNext(self):
     def testDeletePostUnsafeNext(self):
         """
         """
@@ -187,7 +193,11 @@ class ApproveViewTests(CommentTestCase):
         pk = comments[0].pk
         pk = comments[0].pk
         self.client.login(username="normaluser", password="normaluser")
         self.client.login(username="normaluser", password="normaluser")
         response = self.client.get("/approve/%d/" % pk)
         response = self.client.get("/approve/%d/" % pk)
-        self.assertRedirects(response, "http://testserver/accounts/login/?next=/approve/%d/" % pk)
+        self.assertRedirects(
+            response,
+            "http://testserver/accounts/login/?next=/approve/%d/" % pk,
+            fetch_redirect_response=False
+        )
 
 
         makeModerator("normaluser")
         makeModerator("normaluser")
         response = self.client.get("/approve/%d/" % pk)
         response = self.client.get("/approve/%d/" % pk)
@@ -221,7 +231,8 @@ class ApproveViewTests(CommentTestCase):
         response = self.client.post("/approve/%d/" % c1.pk,
         response = self.client.post("/approve/%d/" % c1.pk,
             {'next': "/go/here/"})
             {'next': "/go/here/"})
         self.assertRedirects(response,
         self.assertRedirects(response,
-            "http://testserver/go/here/?c=%d" % c1.pk)
+            "http://testserver/go/here/?c=%d" % c1.pk,
+            fetch_redirect_response=False)
 
 
     def testApprovePostUnsafeNext(self):
     def testApprovePostUnsafeNext(self):
         """
         """