Fixed #4988 -- In the test client, Added tracking of the client and request that caused a response so that the assertRedirects check can use the correct client when following a redirect. Well spotted, alex@gc-web.de.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6039 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 35 insertions, 3 deletions

diff --git a/tests/modeltests/test_client/models.py b/tests/modeltests/test_client/models.py
index 200a71f6f9..2bc1dfe02b 100644
--- a/tests/modeltests/test_client/models.py
+++ b/tests/modeltests/test_client/models.py
@@ -234,7 +234,8 @@ class ClientTest(TestCase):
         self.assertRedirects(response, '/accounts/login/?next=/test_client/login_protected_view/')
         
         # Log in
-        self.client.login(username='testclient', password='password')
+        login = self.client.login(username='testclient', password='password')
+        self.assertTrue(login, 'Could not log in')
 
         # Request a page that requires a login
         response = self.client.get('/test_client/login_protected_view/')
diff --git a/tests/regressiontests/test_client_regress/models.py b/tests/regressiontests/test_client_regress/models.py
index e85544f285..aa18a48852 100644
--- a/tests/regressiontests/test_client_regress/models.py
+++ b/tests/regressiontests/test_client_regress/models.py
@@ -212,7 +212,7 @@ class AssertFormErrorTests(TestCase):
         except AssertionError, e:
             self.assertEqual(str(e), "The field 'email' on form 'form' in context 0 does not contain the error 'Some error.' (actual errors: [u'Enter a valid e-mail address.'])")
 
-class AssertFileUploadTests(TestCase):
+class FileUploadTests(TestCase):
     def test_simple_upload(self):
         fd = open(os.path.join(os.path.dirname(__file__), "views.py"))
         post_data = {
@@ -221,3 +221,22 @@ class AssertFileUploadTests(TestCase):
         }
         response = self.client.post('/test_client_regress/file_upload/', post_data)
         self.assertEqual(response.status_code, 200)
+
+class LoginTests(TestCase):
+    fixtures = ['testdata']
+
+    def test_login_different_client(self):
+        "Check that using a different test client doesn't violate authentication"
+
+        # Create a second client, and log in.
+        c = Client()
+        login = c.login(username='testclient', password='password')
+        self.assertTrue(login, 'Could not log in')
+
+        # Get a redirection page with the second client.
+        response = c.get("/test_client_regress/login_protected_redirect_view/")
+        
+        # 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/")
diff --git a/tests/regressiontests/test_client_regress/urls.py b/tests/regressiontests/test_client_regress/urls.py
index 160f9f992d..e771707f61 100644
--- a/tests/regressiontests/test_client_regress/urls.py
+++ b/tests/regressiontests/test_client_regress/urls.py
@@ -4,4 +4,6 @@ import views
 urlpatterns = patterns('',
     (r'^no_template_view/$', views.no_template_view),
     (r'^file_upload/$', views.file_upload_view),
+    (r'^get_view/$', views.get_view),
+    (r'^login_protected_redirect_view/$', views.login_protected_redirect_view)
 )
diff --git a/tests/regressiontests/test_client_regress/views.py b/tests/regressiontests/test_client_regress/views.py
index d3fbcf8448..75efd212e1 100644
--- a/tests/regressiontests/test_client_regress/views.py
+++ b/tests/regressiontests/test_client_regress/views.py
@@ -1,5 +1,6 @@
+from django.contrib.auth.decorators import login_required
 from django.core.mail import EmailMessage, SMTPConnection
-from django.http import HttpResponse, HttpResponseServerError
+from django.http import HttpResponse, HttpResponseRedirect, HttpResponseServerError
 from django.shortcuts import render_to_response
 
 def no_template_view(request):
@@ -18,3 +19,12 @@ def file_upload_view(request):
     else:
         return HttpResponseServerError()
 
+def get_view(request):
+    "A simple login protected view"    
+    return HttpResponse("Hello world")
+get_view = login_required(get_view)
+
+def login_protected_redirect_view(request):
+    "A view that redirects all requests to the GET view"
+    return HttpResponseRedirect('/test_client_regress/get_view/')
+login_protected_redirect_view = login_required(login_protected_redirect_view)
\ No newline at end of file