Changeset 5677

Timestamp:

07/12/07 10:26:37 (1 year ago)

Author:

russellm

Message:

Fixed #4526 -- Modified the test Client login method to fail when a user is inactive. Thanks, marcin@elksoft.pl.

Files:

• django/trunk/django/test/client.py (modified) (1 diff)
• django/trunk/tests/modeltests/test_client/fixtures/testdata.json (modified) (1 diff)
• django/trunk/tests/modeltests/test_client/models.py (modified) (1 diff)

django/trunk/django/test/client.py

@@ -226 +226 @@
-
-        Returns True if login is possible; False if the provided credentials
-
+
+
-        """
-        user = authenticate(**credentials)
-
+user.is_active and 
-            obj = Session.objects.get_new_session_object()
-

django/trunk/tests/modeltests/test_client/fixtures/testdata.json

@@ -17 +17 @@
-            "date_joined": "2006-12-17 07:03:31"
-        }
+    },
+    {
+        "pk": "2", 
+        "model": "auth.user", 
+        "fields": {
+            "username": "inactive", 
+            "first_name": "Inactive", 
+            "last_name": "User", 
+            "is_active": false, 
+            "is_superuser": false, 
+            "is_staff": false, 
+            "last_login": "2006-12-17 07:03:31", 
+            "groups": [], 
+            "user_permissions": [], 
+            "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", 
+            "email": "testclient@example.com", 
+            "date_joined": "2006-12-17 07:03:31"
+        }
-    }
-]

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

@@ -229 +229 @@
-        self.failIf(login)
-
+    def test_view_with_inactive_login(self):
+        "Request a page that is protected with @login, but use an inactive login"
+
+        login = self.client.login(username='inactive', password='password')
+        self.failIf(login)
+
-    def test_session_modifying_view(self):
-        "Request a page that modifies the session"