Changeset 5228

Timestamp:

05/14/07 06:07:14 (2 years ago)

Author:

russellm

Message:

Fixed some incorrect reporting of error messages in assertRedirects, and added test cases to validate.

Files:

• django/trunk/django/test/testcases.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/test_client_regress/models.py (modified) (1 diff)

django/trunk/django/test/testcases.py

@@ -63 +63 @@
-        """
-        self.assertEqual(response.status_code, status_code, 
-
+ as expected
-                (response.status_code, status_code))
-        scheme, netloc, path, params, query, fragment = urlparse(response['Location'])
@@ -71 +71 @@
-        self.assertEqual(redirect_response.status_code, target_status_code, 
-            "Couldn't retrieve redirection page '%s': response code was %d (expected %d)" % 
-sponse.status_code, 
+direct_response.status_code, target_
-    
-    def assertContains(self, response, text, count=1, status_code=200):

django/trunk/tests/regressiontests/test_client_regress/models.py

@@ -61 +61 @@
-        except AssertionError, e:
-            self.assertEquals(str(e), "Template 'Valid POST Template' was not one of the templates used to render the response. Templates used: ['form_view.html', 'base.html']")
+
+class AssertRedirectsTests(TestCase):
+    def test_redirect_page(self):
+        "An assertion is raised if the original page couldn't be retrieved as expected"        
+        # This page will redirect with code 301, not 302
+        response = self.client.get('/test_client/permanent_redirect_view/')        
+        try:
+            self.assertRedirects(response, '/test_client/get_view/')
+        except AssertionError, e:
+            self.assertEquals(str(e), "Response didn't redirect as expected: Reponse code was 301 (expected 302)")
+
+    def test_incorrect_target(self):
+        "An assertion is raised if the response redirects to another target"
+        response = self.client.get('/test_client/permanent_redirect_view/')        
+        try:
+            # Should redirect to get_view
+            self.assertRedirects(response, '/test_client/some_view/')
+        except AssertionError, e:
+            self.assertEquals(str(e), "Response didn't redirect as expected: Reponse code was 301 (expected 302)")
-        
+    def test_target_page(self):
+        "An assertion is raised if the reponse redirect target cannot be retrieved as expected"
+        response = self.client.get('/test_client/double_redirect_view/')
+        try:
+            # The redirect target responds with a 301 code, not 200
+            self.assertRedirects(response, '/test_client/permanent_redirect_view/')
+        except AssertionError, e:
+            self.assertEquals(str(e), "Couldn't retrieve redirection page '/test_client/permanent_redirect_view/': response code was 301 (expected 200)")
+            
-class AssertFormErrorTests(TestCase):
-    def test_unknown_form(self):