diff options
Diffstat (limited to 'django/contrib/auth/tests/models.py')
| -rw-r--r-- | django/contrib/auth/tests/models.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/django/contrib/auth/tests/models.py b/django/contrib/auth/tests/models.py index 324f433df6..b9565922a2 100644 --- a/django/contrib/auth/tests/models.py +++ b/django/contrib/auth/tests/models.py @@ -46,12 +46,12 @@ class NaturalKeysTestCase(TestCase): def test_user_natural_key(self): staff_user = User.objects.get(username='staff') - self.assertEquals(User.objects.get_by_natural_key('staff'), staff_user) - self.assertEquals(staff_user.natural_key(), ('staff',)) + self.assertEqual(User.objects.get_by_natural_key('staff'), staff_user) + self.assertEqual(staff_user.natural_key(), ('staff',)) def test_group_natural_key(self): users_group = Group.objects.create(name='users') - self.assertEquals(Group.objects.get_by_natural_key('users'), users_group) + self.assertEqual(Group.objects.get_by_natural_key('users'), users_group) @override_settings(USE_TZ=False) @@ -61,7 +61,7 @@ class LoadDataWithoutNaturalKeysTestCase(TestCase): def test_user_is_created_and_added_to_group(self): user = User.objects.get(username='my_username') group = Group.objects.get(name='my_group') - self.assertEquals(group, user.groups.get()) + self.assertEqual(group, user.groups.get()) @override_settings(USE_TZ=False) @@ -71,7 +71,7 @@ class LoadDataWithNaturalKeysTestCase(TestCase): def test_user_is_created_and_added_to_group(self): user = User.objects.get(username='my_username') group = Group.objects.get(name='my_group') - self.assertEquals(group, user.groups.get()) + self.assertEqual(group, user.groups.get()) class UserManagerTestCase(TestCase): @@ -79,23 +79,23 @@ class UserManagerTestCase(TestCase): def test_create_user(self): email_lowercase = 'normal@normal.com' user = User.objects.create_user('user', email_lowercase) - self.assertEquals(user.email, email_lowercase) - self.assertEquals(user.username, 'user') - self.assertEquals(user.password, '!') + self.assertEqual(user.email, email_lowercase) + self.assertEqual(user.username, 'user') + self.assertEqual(user.password, '!') def test_create_user_email_domain_normalize_rfc3696(self): # According to http://tools.ietf.org/html/rfc3696#section-3 # the "@" symbol can be part of the local part of an email address returned = UserManager.normalize_email(r'Abc\@DEF@EXAMPLE.com') - self.assertEquals(returned, r'Abc\@DEF@example.com') + self.assertEqual(returned, r'Abc\@DEF@example.com') def test_create_user_email_domain_normalize(self): returned = UserManager.normalize_email('normal@DOMAIN.COM') - self.assertEquals(returned, 'normal@domain.com') + self.assertEqual(returned, 'normal@domain.com') def test_create_user_email_domain_normalize_with_whitespace(self): returned = UserManager.normalize_email('email\ with_whitespace@D.COM') - self.assertEquals(returned, 'email\ with_whitespace@d.com') + self.assertEqual(returned, 'email\ with_whitespace@d.com') def test_empty_username(self): self.assertRaisesMessage(ValueError, |