Changeset 6039

Timestamp:

09/03/07 06:21:40 (1 year ago)

Author:

russellm

Message:

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.

Files:

• django/trunk/django/test/client.py (modified) (1 diff)
• django/trunk/django/test/testcases.py (modified) (1 diff)
• django/trunk/docs/testing.txt (modified) (3 diffs)
• django/trunk/tests/modeltests/test_client/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/models.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/test_client_regress/urls.py (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/views.py (modified) (2 diffs)

django/trunk/django/test/client.py

@@ -183 +183 @@
-            raise self.exc_info[1], None, self.exc_info[2]
-
+        # Save the client and request that stimulated the response
+        response.client = self
+        response.request = request
+
-        # Add any rendered template detail to the response
-        # If there was only one template rendered (the most likely case),

django/trunk/django/test/testcases.py

@@ -81 +81 @@
-            "Response redirected to '%s', expected '%s'" % (url, expected_url))
-        
-
+
+
+
-        self.assertEqual(redirect_response.status_code, target_status_code, 
-            "Couldn't retrieve redirection page '%s': response code was %d (expected %d)" % 

django/trunk/docs/testing.txt

@@ -578 +578 @@
-    Attribute        Description
-    ===============  ==========================================================
-status_code``  The HTTP status of the response, as an integer. See
-RFC2616_ for a full list of HTTP status codes
+client``       The test client that was used to make the request that
+resulted in the response
-
-    ``content``      The body of the response, as a string. This is the final
-                     page content as rendered by the view, or any error
-                     message (such as the URL for a 302 redirect).
+
+    ``context``      The template ``Context`` instance that was used to render
+                     the template that produced the response content.
+
+                     If the rendered page used multiple templates, then
+                     ``context`` will be a list of ``Context``
+                     objects, in the order in which they were rendered.
+
+    ``request``      The request data that stimulated the response.
+
+    ``status_code``  The HTTP status of the response, as an integer. See
+                     RFC2616_ for a full list of HTTP status codes.
-
-    ``template``     The ``Template`` instance that was used to render the
@@ -595 +607 @@
-                     be a list of ``Template`` instances, in the order in
-                     which they were rendered.
-
-    ``context``      The template ``Context`` instance that was used to render
-                     the template that produced the response content.
-
-                     As with ``template``, if the rendered page used multiple
-                     templates, then ``context`` will be a list of ``Context``
-                     objects, in the order in which they were rendered.
-    ===============  ==========================================================
-
@@ -829 +834 @@
-``assertRedirects(response, expected_url, status_code=302, target_status_code=200)``
-    Asserts that the response return a ``status_code`` redirect status,
- 
+
-    page was received with ``target_status_code``.
-

django/trunk/tests/modeltests/test_client/models.py

@@ -235 +235 @@
-        
-        # Log in
-
+
+
-
-        # Request a page that requires a login

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

@@ -213 +213 @@
-            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.'])")
-
-Assert
+
-    def test_simple_upload(self):
-        fd = open(os.path.join(os.path.dirname(__file__), "views.py"))
@@ -222 +222 @@
-        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/")

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

@@ -5 +5 @@
-    (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)
-)

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

@@ +1 @@
+from django.contrib.auth.decorators import login_required
-from django.core.mail import EmailMessage, SMTPConnection
-
+Redirect, HttpResponse
-from django.shortcuts import render_to_response
-
@@ -19 +20 @@
-        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)