From eabb57f6f089bbd3c528eddc93ad61829afb5d7a Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Fri, 14 Sep 2007 06:05:54 +0000 Subject: [PATCH] Fixed tests to match new HTTP redirect behaviour. We always redirect to absolute URLs now. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6169 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/modeltests/test_client/models.py | 12 ++++++------ tests/regressiontests/test_client_regress/models.py | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/modeltests/test_client/models.py b/tests/modeltests/test_client/models.py index 5e1eb529c01..1ba86a4a417 100644 --- a/tests/modeltests/test_client/models.py +++ b/tests/modeltests/test_client/models.py @@ -84,7 +84,7 @@ class ClientTest(TestCase): "GET a URL that redirects elsewhere" response = self.client.get('/test_client/redirect_view/') # Check that the response was a 302 (redirect) - self.assertRedirects(response, '/test_client/get_view/') + self.assertRedirects(response, 'http://testserver/test_client/get_view/') client_providing_host = Client(HTTP_HOST='django.testserver') response = client_providing_host.get('/test_client/redirect_view/') @@ -96,13 +96,13 @@ class ClientTest(TestCase): response = self.client.get('/test_client/redirect_view/', {'var': 'value'}) # Check if parameters are intact - self.assertRedirects(response, '/test_client/get_view/?var=value') + self.assertRedirects(response, 'http://testserver/test_client/get_view/?var=value') def test_permanent_redirect(self): "GET a URL that redirects permanently elsewhere" response = self.client.get('/test_client/permanent_redirect_view/') # Check that the response was a 301 (permanent redirect) - self.assertRedirects(response, '/test_client/get_view/', status_code=301) + self.assertRedirects(response, 'http://testserver/test_client/get_view/', status_code=301) client_providing_host = Client(HTTP_HOST='django.testserver') response = client_providing_host.get('/test_client/permanent_redirect_view/') @@ -115,7 +115,7 @@ class ClientTest(TestCase): # Check that the response was a 302, and that # the attempt to get the redirection location returned 301 when retrieved - self.assertRedirects(response, '/test_client/permanent_redirect_view/', target_status_code=301) + self.assertRedirects(response, 'http://testserver/test_client/permanent_redirect_view/', target_status_code=301) def test_notfound_response(self): "GET a URL that responds as '404:Not Found'" @@ -239,7 +239,7 @@ class ClientTest(TestCase): # Get the page without logging in. Should result in 302. response = self.client.get('/test_client/login_protected_view/') - self.assertRedirects(response, '/accounts/login/?next=/test_client/login_protected_view/') + self.assertRedirects(response, 'http://testserver/accounts/login/?next=/test_client/login_protected_view/') # Log in login = self.client.login(username='testclient', password='password') @@ -277,7 +277,7 @@ class ClientTest(TestCase): # Request a page that requires a login response = self.client.get('/test_client/login_protected_view/') - self.assertRedirects(response, '/accounts/login/?next=/test_client/login_protected_view/') + self.assertRedirects(response, 'http://testserver/accounts/login/?next=/test_client/login_protected_view/') def test_session_modifying_view(self): "Request a page that modifies the session" diff --git a/tests/regressiontests/test_client_regress/models.py b/tests/regressiontests/test_client_regress/models.py index a15e4f15ecb..c63dc2b384c 100644 --- a/tests/regressiontests/test_client_regress/models.py +++ b/tests/regressiontests/test_client_regress/models.py @@ -119,7 +119,7 @@ class AssertRedirectsTests(TestCase): 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/'") + self.assertEquals(str(e), "Response redirected to 'http://testserver/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" @@ -135,7 +135,7 @@ class AssertRedirectsTests(TestCase): 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/') + self.assertRedirects(response, 'http://testserver/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)") @@ -260,4 +260,4 @@ class LoginTests(TestCase): # At this points, the self.client isn't logged in. # Check that assertRedirects uses the original client, not the # default client. - self.assertRedirects(response, "/test_client_regress/get_view/") + self.assertRedirects(response, "http://testserver/test_client_regress/get_view/")