mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
Cleaned formatting/comments in PasswordResetFormTest
This commit is contained in:
parent
f8632572ad
commit
59a8808632
@ -360,14 +360,21 @@ class UserChangeFormTest(TestCase):
|
||||
|
||||
|
||||
@skipIfCustomUser
|
||||
@override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
|
||||
@override_settings(
|
||||
PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),
|
||||
TEMPLATE_LOADERS=('django.template.loaders.filesystem.Loader',),
|
||||
TEMPLATE_DIRS=(
|
||||
os.path.join(os.path.dirname(upath(__file__)), 'templates'),
|
||||
),
|
||||
USE_TZ=False,
|
||||
)
|
||||
class PasswordResetFormTest(TestCase):
|
||||
|
||||
fixtures = ['authtestdata.json']
|
||||
|
||||
def create_dummy_user(self):
|
||||
"""creates a user and returns a tuple
|
||||
(user_object, username, email)
|
||||
"""
|
||||
Create a user and return a tuple (user_object, username, email).
|
||||
"""
|
||||
username = 'jsmith'
|
||||
email = 'jsmith@example.com'
|
||||
@ -381,21 +388,16 @@ class PasswordResetFormTest(TestCase):
|
||||
self.assertEqual(form['email'].errors, [_('Enter a valid email address.')])
|
||||
|
||||
def test_nonexistant_email(self):
|
||||
# Test nonexistant email address. This should not fail because it would
|
||||
# expose information about registered users.
|
||||
"""
|
||||
Test nonexistant email address. This should not fail because it would
|
||||
expose information about registered users.
|
||||
"""
|
||||
data = {'email': 'foo@bar.com'}
|
||||
form = PasswordResetForm(data)
|
||||
self.assertTrue(form.is_valid())
|
||||
self.assertEqual(len(mail.outbox), 0)
|
||||
|
||||
@override_settings(
|
||||
TEMPLATE_LOADERS=('django.template.loaders.filesystem.Loader',),
|
||||
TEMPLATE_DIRS=(
|
||||
os.path.join(os.path.dirname(upath(__file__)), 'templates'),
|
||||
),
|
||||
)
|
||||
def test_cleaned_data(self):
|
||||
# Regression test
|
||||
(user, username, email) = self.create_dummy_user()
|
||||
data = {'email': email}
|
||||
form = PasswordResetForm(data)
|
||||
@ -404,12 +406,6 @@ class PasswordResetFormTest(TestCase):
|
||||
self.assertEqual(form.cleaned_data['email'], email)
|
||||
self.assertEqual(len(mail.outbox), 1)
|
||||
|
||||
@override_settings(
|
||||
TEMPLATE_LOADERS=('django.template.loaders.filesystem.Loader',),
|
||||
TEMPLATE_DIRS=(
|
||||
os.path.join(os.path.dirname(upath(__file__)), 'templates'),
|
||||
),
|
||||
)
|
||||
def test_custom_email_subject(self):
|
||||
data = {'email': 'testclient@example.com'}
|
||||
form = PasswordResetForm(data)
|
||||
@ -421,17 +417,20 @@ class PasswordResetFormTest(TestCase):
|
||||
self.assertEqual(len(mail.outbox), 1)
|
||||
self.assertEqual(mail.outbox[0].subject, 'Custom password reset on example.com')
|
||||
|
||||
def test_bug_5605(self):
|
||||
# bug #5605, preserve the case of the user name (before the @ in the
|
||||
# email address) when creating a user.
|
||||
def test_preserve_username_case(self):
|
||||
"""
|
||||
Preserve the case of the user name (before the @ in the email address)
|
||||
when creating a user (#5605).
|
||||
"""
|
||||
user = User.objects.create_user('forms_test2', 'tesT@EXAMple.com', 'test')
|
||||
self.assertEqual(user.email, 'tesT@example.com')
|
||||
user = User.objects.create_user('forms_test3', 'tesT', 'test')
|
||||
self.assertEqual(user.email, 'tesT')
|
||||
|
||||
def test_inactive_user(self):
|
||||
#tests that inactive user cannot
|
||||
#receive password reset email
|
||||
"""
|
||||
Test that inactive user cannot receive password reset email.
|
||||
"""
|
||||
(user, username, email) = self.create_dummy_user()
|
||||
user.is_active = False
|
||||
user.save()
|
||||
@ -452,12 +451,6 @@ class PasswordResetFormTest(TestCase):
|
||||
form.save()
|
||||
self.assertEqual(len(mail.outbox), 0)
|
||||
|
||||
@override_settings(
|
||||
TEMPLATE_LOADERS=('django.template.loaders.filesystem.Loader',),
|
||||
TEMPLATE_DIRS=(
|
||||
os.path.join(os.path.dirname(upath(__file__)), 'templates'),
|
||||
),
|
||||
)
|
||||
def test_save_plaintext_email(self):
|
||||
"""
|
||||
Test the PasswordResetForm.save() method with no html_email_template_name
|
||||
@ -477,12 +470,6 @@ class PasswordResetFormTest(TestCase):
|
||||
self.assertEqual(message.get_all('to'), [email])
|
||||
self.assertTrue(re.match(r'^http://example.com/reset/[\w+/-]', message.get_payload()))
|
||||
|
||||
@override_settings(
|
||||
TEMPLATE_LOADERS=('django.template.loaders.filesystem.Loader',),
|
||||
TEMPLATE_DIRS=(
|
||||
os.path.join(os.path.dirname(upath(__file__)), 'templates'),
|
||||
),
|
||||
)
|
||||
def test_save_html_email_template_name(self):
|
||||
"""
|
||||
Test the PasswordResetFOrm.save() method with html_email_template_name
|
||||
|
Loading…
Reference in New Issue
Block a user