Changeset 5916

Timestamp:

08/17/07 09:20:25 (1 year ago)

Author:

russellm

Message:

Fixed #5189 -- Added logout method to test Client. Thanks, Jakub Wisniowski <restless.being@gmail.com>.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/test/client.py (modified) (1 diff)
• django/trunk/docs/testing.txt (modified) (4 diffs)
• django/trunk/tests/modeltests/test_client/models.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -285 +285 @@
-    Rachel Willmer <http://www.willmer.com/kb/>
-    Gary Wilson <gary.wilson@gmail.com>
+    Jakub Wiśniowski <restless.being@gmail.com>
-    wojtek
-    ye7cakf02@sneakemail.com

django/trunk/django/test/client.py

@@ -254 +254 @@
-            return False
-
+    def logout(self):
+        """Removes the authenticated user's cookies.
+
+        Causes the authenticated user to be logged out.
+        """
+        try:
+            Session.objects.get(session_key=self.cookies['sessionid'].value).delete()
+        except KeyError:
+            pass
+
+        self.cookies = SimpleCookie()

django/trunk/docs/testing.txt

@@ -551 +551 @@
-    manually (using the Django model API) or with a test fixture.
-
+``logout()``
+    **New in Django development version**
+
+    If your site uses Django's `authentication system`_, the ``logout()``
+    method can be used to simulate the effect of a user logging out of
+    your site.
+
+    After you call this method, the test client will have all the cookies and
+    session data cleared to defaults. Subsequent requests will appear to
+    come from an AnonymousUser.
+
-.. _authentication system: ../authentication/
-.. _authentication backend: ../authentication/#other-authentication-sources
@@ -759 +770 @@
-      flush the database, returning the database to the state it was in
-      directly after ``syncdb`` was called.
-
+
-    * Then, all the named fixtures are installed. In this example, Django will
-      install any JSON fixture named ``mammals``, followed by any fixture named
@@ -844 +855 @@
-mail server, if you're running one.)
-
- 
+
-``django.core.mail.outbox``. This is a simple list of all `EmailMessage`_
-instances that have been sent. It does not exist under normal execution
@@ -978 +989 @@
-    ``autoclobber`` describes the behavior that will occur if a database with
-    the same name as the test database is discovered:
-
+
-        * If ``autoclobber`` is ``False``, the user will be asked to approve
-          destroying the existing database. ``sys.exit`` is called if the user

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

@@ -247 +247 @@
-        self.failIf(login)
-
+    def test_logout(self):
+        # Log in
+        self.client.login(username='testclient', password='password')
+
+        # Request a page that requires a login
+        response = self.client.get('/test_client/login_protected_view/')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['user'].username, 'testclient')
+
+        # Log out
+        self.client.logout()
+
+        # Request a page that requires a login
+        response = self.client.get('/test_client/login_protected_view/')
+        self.assertRedirects(response, '/accounts/login/')
+
-    def test_session_modifying_view(self):
-        "Request a page that modifies the session"