Changeset 8497

Timestamp:

08/23/08 13:20:49 (3 months ago)

Author:

mtredinnick

Message:

Tests for password change process. Thanks, Mike Richardson. Fixed #8402.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/contrib/auth/tests/__init__.py (modified) (2 diffs)
• django/trunk/django/contrib/auth/tests/templates (added)
• django/trunk/django/contrib/auth/tests/templates/registration (added)
• django/trunk/django/contrib/auth/tests/templates/registration/login.html (added)
• django/trunk/django/contrib/auth/tests/views.py (modified) (9 diffs)
• django/trunk/django/contrib/auth/urls.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -331 +331 @@
-    rhettg@gmail.com
-    ricardojbarrios@gmail.com
+    Mike Richardson
-    Matt Riggott
-    Henrique Romano <onaiort@gmail.com>

django/trunk/django/contrib/auth/tests/__init__.py

@@ -1 +1 @@
-from django.contrib.auth.tests.basic import BASIC_TESTS
-
+, ChangePasswordTest
-from django.contrib.auth.tests.forms import FORM_TESTS
-from django.contrib.auth.tests.tokens import TOKEN_GENERATOR_TESTS
+
+# The password for the fixture data users is 'password'
-
-__test__ = {
@@ -8 +10 @@
-    'PASSWORDRESET_TESTS': PasswordResetTest,
-    'FORM_TESTS': FORM_TESTS,
-
+
+
-}

django/trunk/django/contrib/auth/tests/views.py

@@ -1 +1 @@
-
+import os
-import re
+
+from django.conf import settings
-from django.contrib.auth.models import User
-from django.test import TestCase
@@ -8 +11 @@
-    fixtures = ['authtestdata.json']
-    urls = 'django.contrib.auth.urls'
-
+
-    def test_email_not_found(self):
-        "Error is raised if the provided email address isn't currently registered"
@@ -16 +19 @@
-        self.assertContains(response, "That e-mail address doesn't have an associated user account")
-        self.assertEquals(len(mail.outbox), 0)
-
+
-    def test_email_found(self):
-        "Email is sent if a valid email address is provided for password reset"
@@ -40 +43 @@
-        response = self.client.get(path)
-        # redirect to a 'complete' page:
- 
+
-        self.assert_("Please enter your new password" in response.content)
-
@@ -50 +53 @@
-
-        response = self.client.get(path)
- 
+
-        self.assert_("The password reset link was invalid" in response.content)
-
@@ -61 +64 @@
-        response = self.client.post(path, {'new_password1': 'anewpassword',
-                                           'new_password2':' anewpassword'})
- 
+
-        u = User.objects.get(email='staffmember@example.com')
-        self.assert_(not u.check_password("anewpassword"))
@@ -70 +73 @@
-                                           'new_password2': 'anewpassword'})
-        # It redirects us to a 'complete' page:
- 
- 
+
+
-        u = User.objects.get(email='staffmember@example.com')
-        self.assert_(u.check_password("anewpassword"))
@@ -77 +80 @@
-        # Check we can't use the link again
-        response = self.client.get(path)
- 
+
-        self.assert_("The password reset link was invalid" in response.content)
-
@@ -87 +90 @@
-        self.assert_("The two password fields didn't match" in response.content)
-
+
+class ChangePasswordTest(TestCase):
+    fixtures = ['authtestdata.json']
+    urls = 'django.contrib.auth.urls'
+
+    def setUp(self):
+        self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS
+        settings.TEMPLATE_DIRS = (
+            os.path.join(
+                os.path.dirname(__file__),
+                'templates'
+            )
+        ,)
+
+    def tearDown(self):
+        settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
+
+    def login(self, password='password'):
+        response = self.client.post('/login/', {
+            'username': 'testclient',
+            'password': password
+            }
+        )
+        self.assertEquals(response.status_code, 302)
+        self.assert_(response['Location'].endswith('/accounts/profile/'))
+
+    def fail_login(self, password='password'):
+        response = self.client.post('/login/', {
+            'username': 'testclient',
+            'password': password
+            }
+        )
+        self.assertEquals(response.status_code, 200)
+        self.assert_("Please enter a correct username and password. Note that both fields are case-sensitive." in response.content)
+
+    def logout(self):
+        response = self.client.get('/logout/')
+
+    def test_password_change_fails_with_invalid_old_password(self):
+        self.login()
+        response = self.client.post('/password_change/', {
+            'old_password': 'donuts',
+            'new_password1': 'password1',
+            'new_password2': 'password1',
+            }
+        )
+        self.assertEquals(response.status_code, 200)
+        self.assert_("Your old password was entered incorrectly. Please enter it again." in response.content)
+
+    def test_password_change_fails_with_mismatched_passwords(self):
+        self.login()
+        response = self.client.post('/password_change/', {
+            'old_password': 'password',
+            'new_password1': 'password1',
+            'new_password2': 'donuts',
+            }
+        )
+        self.assertEquals(response.status_code, 200)
+        self.assert_("The two password fields didn't match." in response.content)
+
+    def test_password_change_succeeds(self):
+        self.login()
+        response = self.client.post('/password_change/', {
+            'old_password': 'password',
+            'new_password1': 'password1',
+            'new_password2': 'password1',
+            }
+        )
+        self.assertEquals(response.status_code, 302)
+        self.assert_(response['Location'].endswith('/password_change/done/'))
+        self.fail_login()
+        self.login(password='password1')
+

django/trunk/django/contrib/auth/urls.py

@@ -6 +6 @@
-
-urlpatterns = patterns('',
+    (r'^login/$', 'django.contrib.auth.views.login'),
-    (r'^logout/$', 'django.contrib.auth.views.logout'),
-    (r'^password_change/$', 'django.contrib.auth.views.password_change'),