Django

Code

Changeset 6169

Show
Ignore:
Timestamp:
09/14/07 01:05:54 (1 year ago)
Author:
mtredinnick
Message:

Fixed tests to match new HTTP redirect behaviour. We always redirect to absolute URLs now.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/tests/modeltests/test_client/models.py

    r6164 r6169  
    8585        response = self.client.get('/test_client/redirect_view/') 
    8686        # Check that the response was a 302 (redirect) 
    87         self.assertRedirects(response, '/test_client/get_view/') 
     87        self.assertRedirects(response, 'http://testserver/test_client/get_view/') 
    8888         
    8989        client_providing_host = Client(HTTP_HOST='django.testserver') 
     
    9797         
    9898        # Check if parameters are intact 
    99         self.assertRedirects(response, '/test_client/get_view/?var=value') 
     99        self.assertRedirects(response, 'http://testserver/test_client/get_view/?var=value') 
    100100 
    101101    def test_permanent_redirect(self): 
     
    103103        response = self.client.get('/test_client/permanent_redirect_view/') 
    104104        # Check that the response was a 301 (permanent redirect) 
    105         self.assertRedirects(response, '/test_client/get_view/', status_code=301) 
     105        self.assertRedirects(response, 'http://testserver/test_client/get_view/', status_code=301) 
    106106 
    107107        client_providing_host = Client(HTTP_HOST='django.testserver') 
     
    116116        # Check that the response was a 302, and that 
    117117        # the attempt to get the redirection location returned 301 when retrieved 
    118         self.assertRedirects(response, '/test_client/permanent_redirect_view/', target_status_code=301) 
     118        self.assertRedirects(response, 'http://testserver/test_client/permanent_redirect_view/', target_status_code=301) 
    119119 
    120120    def test_notfound_response(self): 
     
    240240        # Get the page without logging in. Should result in 302. 
    241241        response = self.client.get('/test_client/login_protected_view/') 
    242         self.assertRedirects(response, '/accounts/login/?next=/test_client/login_protected_view/') 
     242        self.assertRedirects(response, 'http://testserver/accounts/login/?next=/test_client/login_protected_view/') 
    243243         
    244244        # Log in 
     
    278278        # Request a page that requires a login 
    279279        response = self.client.get('/test_client/login_protected_view/') 
    280         self.assertRedirects(response, '/accounts/login/?next=/test_client/login_protected_view/') 
     280        self.assertRedirects(response, 'http://testserver/accounts/login/?next=/test_client/login_protected_view/') 
    281281 
    282282    def test_session_modifying_view(self): 
  • django/trunk/tests/regressiontests/test_client_regress/models.py

    r6043 r6169  
    120120            self.assertRedirects(response, '/test_client/get_view/') 
    121121        except AssertionError, e: 
    122             self.assertEquals(str(e), "Response redirected to '/test_client/get_view/?var=value', expected '/test_client/get_view/'") 
     122            self.assertEquals(str(e), "Response redirected to 'http://testserver/test_client/get_view/?var=value', expected '/test_client/get_view/'") 
    123123 
    124124    def test_incorrect_target(self): 
     
    136136        try: 
    137137            # The redirect target responds with a 301 code, not 200 
    138             self.assertRedirects(response, '/test_client/permanent_redirect_view/') 
     138            self.assertRedirects(response, 'http://testserver/test_client/permanent_redirect_view/') 
    139139        except AssertionError, e: 
    140140            self.assertEquals(str(e), "Couldn't retrieve redirection page '/test_client/permanent_redirect_view/': response code was 301 (expected 200)") 
     
    261261        # Check that assertRedirects uses the original client, not the  
    262262        # default client. 
    263         self.assertRedirects(response, "/test_client_regress/get_view/") 
     263        self.assertRedirects(response, "http://testserver/test_client_regress/get_view/")