Changeset 7809 for django/branches/newforms-admin/django/contrib/auth/tests

Timestamp:

06/30/08 10:38:16 (6 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/django/contrib/auth/tests/basic.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/auth/tests/forms.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/auth/tests/__init__.py (modified) (1 diff)

django/branches/newforms-admin/django/contrib/auth/tests/basic.py

@@ -55 +55 @@
-u'!'
-"""
+
+from django.test import TestCase
+from django.core import mail
+
+class PasswordResetTest(TestCase):
+    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"
+        response = self.client.get('/password_reset/')
+        self.assertEquals(response.status_code, 200)
+        response = self.client.post('/password_reset/', {'email': 'not_a_real_email@email.com'})
+        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"
+        response = self.client.post('/password_reset/', {'email': 'staffmember@example.com'})
+        self.assertEquals(response.status_code, 302)
+        self.assertEquals(len(mail.outbox), 1)

django/branches/newforms-admin/django/contrib/auth/tests/forms.py

@@ -1 @@
-
-from django.core import mail
-from django.test import TestCase
-from django.contrib.auth.models import User
-from django.contrib.auth.forms import PasswordResetForm
-
-class PasswordResetFormTestCase(TestCase):
-    def testValidUser(self):
-        data = {
-            'email': 'nonexistent@example.com',
-        }
-        form = PasswordResetForm(data)
-        self.assertEqual(form.is_valid(), False)
-        self.assertEqual(form["email"].errors, [u"That e-mail address doesn't have an associated user account. Are you sure you've registered?"])
-    
-    def testEmail(self):
-        # TODO: remove my email address from the test ;)
-        User.objects.create_user('atestuser', 'atestuser@example.com', 'test789')
-        data = {
-            'email': 'atestuser@example.com',
-        }
-        form = PasswordResetForm(data)
-        self.assertEqual(form.is_valid(), True)
-        # TODO: look at why using contrib.sites breaks other tests
-        form.save(domain_override="example.com")
-        self.assertEqual(len(mail.outbox), 1)
-        self.assertEqual(mail.outbox[0].subject, u'Password reset on example.com')
-        # TODO: test mail body. need to figure out a way to get the password in plain text
-        # self.assertEqual(mail.outbox[0].body, '')
-
-FORM_TESTS = """

django/branches/newforms-admin/django/contrib/auth/tests/__init__.py

@@ -1 @@
-
-, PasswordResetFormTestCase
+, PasswordResetTest
+
-
-__test__ = {
-    'BASIC_TESTS': BASIC_TESTS,
-FormTestCase
+Test
-    'FORM_TESTS': FORM_TESTS,
-}