From 590b8c1c57217bd8bd33998bae490dbe3d09f045 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 26 Oct 2015 18:43:42 -0400 Subject: [PATCH] Removed unnecessary app_label='auth' on auth_tests models. This is a relic of when the tests were stored in contrib.auth.tests. --- tests/auth_tests/models/custom_permissions.py | 3 --- tests/auth_tests/models/invalid_models.py | 9 --------- tests/auth_tests/models/is_active.py | 3 --- tests/auth_tests/models/with_foreign_key.py | 6 ------ tests/auth_tests/test_auth_backends.py | 2 +- tests/auth_tests/test_management.py | 14 +++++++------- tests/auth_tests/test_models.py | 2 +- 7 files changed, 9 insertions(+), 30 deletions(-) diff --git a/tests/auth_tests/models/custom_permissions.py b/tests/auth_tests/models/custom_permissions.py index 7693730745..7687d95df6 100644 --- a/tests/auth_tests/models/custom_permissions.py +++ b/tests/auth_tests/models/custom_permissions.py @@ -30,9 +30,6 @@ with RemoveGroupsAndPermissions(): USERNAME_FIELD = 'email' REQUIRED_FIELDS = ['date_of_birth'] - class Meta: - app_label = 'auth' - def get_full_name(self): return self.email diff --git a/tests/auth_tests/models/invalid_models.py b/tests/auth_tests/models/invalid_models.py index eaaff2aa15..4e2307ea59 100644 --- a/tests/auth_tests/models/invalid_models.py +++ b/tests/auth_tests/models/invalid_models.py @@ -19,9 +19,6 @@ class CustomUserNonUniqueUsername(AbstractBaseUser): objects = UserManager() - class Meta: - app_label = 'auth' - class CustomUserNonListRequiredFields(AbstractBaseUser): "A user with a non-list REQUIRED_FIELDS" @@ -31,9 +28,6 @@ class CustomUserNonListRequiredFields(AbstractBaseUser): USERNAME_FIELD = 'username' REQUIRED_FIELDS = 'date_of_birth' - class Meta: - app_label = 'auth' - class CustomUserBadRequiredFields(AbstractBaseUser): "A user with a USERNAME_FIELD that appears in REQUIRED_FIELDS (invalid)" @@ -42,6 +36,3 @@ class CustomUserBadRequiredFields(AbstractBaseUser): USERNAME_FIELD = 'username' REQUIRED_FIELDS = ['username', 'date_of_birth'] - - class Meta: - app_label = 'auth' diff --git a/tests/auth_tests/models/is_active.py b/tests/auth_tests/models/is_active.py index 6e4368f927..4c3144ffdc 100644 --- a/tests/auth_tests/models/is_active.py +++ b/tests/auth_tests/models/is_active.py @@ -12,7 +12,4 @@ class IsActiveTestUser1(AbstractBaseUser): USERNAME_FIELD = 'username' - class Meta: - app_label = 'auth' - # the is_active attr is provided by AbstractBaseUser diff --git a/tests/auth_tests/models/with_foreign_key.py b/tests/auth_tests/models/with_foreign_key.py index 2288662905..d16329a04b 100644 --- a/tests/auth_tests/models/with_foreign_key.py +++ b/tests/auth_tests/models/with_foreign_key.py @@ -5,9 +5,6 @@ from django.db import models class Email(models.Model): email = models.EmailField(verbose_name='email address', max_length=255, unique=True) - class Meta: - app_label = 'auth' - class CustomUserWithFKManager(BaseUserManager): def create_superuser(self, username, email, group, password): @@ -26,6 +23,3 @@ class CustomUserWithFK(AbstractBaseUser): USERNAME_FIELD = 'username' REQUIRED_FIELDS = ['email', 'group'] - - class Meta: - app_label = 'auth' diff --git a/tests/auth_tests/test_auth_backends.py b/tests/auth_tests/test_auth_backends.py index d8b2f43153..6ded9f2eb8 100644 --- a/tests/auth_tests/test_auth_backends.py +++ b/tests/auth_tests/test_auth_backends.py @@ -250,7 +250,7 @@ class ExtensionUserModelBackendTest(BaseModelBackendTest, TestCase): ) -@override_settings(AUTH_USER_MODEL='auth.CustomPermissionsUser') +@override_settings(AUTH_USER_MODEL='auth_tests.CustomPermissionsUser') class CustomPermissionsUserModelBackendTest(BaseModelBackendTest, TestCase): """ Tests for the ModelBackend using the CustomPermissionsUser model. diff --git a/tests/auth_tests/test_management.py b/tests/auth_tests/test_management.py index 435bc9e1e5..f90675ec08 100644 --- a/tests/auth_tests/test_management.py +++ b/tests/auth_tests/test_management.py @@ -327,7 +327,7 @@ class CreatesuperuserManagementCommandTestCase(TestCase): self.assertEqual(CustomUser._default_manager.count(), 0) @override_settings( - AUTH_USER_MODEL='auth.CustomUserNonUniqueUsername', + AUTH_USER_MODEL='auth_tests.CustomUserNonUniqueUsername', AUTHENTICATION_BACKENDS=['my.custom.backend'], ) def test_swappable_user_username_non_unique(self): @@ -406,7 +406,7 @@ class CreatesuperuserManagementCommandTestCase(TestCase): ) self.assertIs(command.stdin, sys.stdin) - @override_settings(AUTH_USER_MODEL='auth.CustomUserWithFK') + @override_settings(AUTH_USER_MODEL='auth_tests.CustomUserWithFK') def test_fields_with_fk(self): new_io = six.StringIO() group = Group.objects.create(name='mygroup') @@ -436,7 +436,7 @@ class CreatesuperuserManagementCommandTestCase(TestCase): stdout=new_io, ) - @override_settings(AUTH_USER_MODEL='auth.CustomUserWithFK') + @override_settings(AUTH_USER_MODEL='auth_tests.CustomUserWithFK') def test_fields_with_fk_interactive(self): new_io = six.StringIO() group = Group.objects.create(name='mygroup') @@ -566,7 +566,7 @@ class CreatesuperuserManagementCommandTestCase(TestCase): class CustomUserModelValidationTestCase(SimpleTestCase): - @override_settings(AUTH_USER_MODEL='auth.CustomUserNonListRequiredFields') + @override_settings(AUTH_USER_MODEL='auth_tests.CustomUserNonListRequiredFields') @override_system_checks([check_user_model]) def test_required_fields_is_list(self): "REQUIRED_FIELDS should be a list." @@ -581,7 +581,7 @@ class CustomUserModelValidationTestCase(SimpleTestCase): ] self.assertEqual(errors, expected) - @override_settings(AUTH_USER_MODEL='auth.CustomUserBadRequiredFields') + @override_settings(AUTH_USER_MODEL='auth_tests.CustomUserBadRequiredFields') @override_system_checks([check_user_model]) def test_username_not_in_required_fields(self): "USERNAME_FIELD should not appear in REQUIRED_FIELDS." @@ -597,7 +597,7 @@ class CustomUserModelValidationTestCase(SimpleTestCase): ] self.assertEqual(errors, expected) - @override_settings(AUTH_USER_MODEL='auth.CustomUserNonUniqueUsername') + @override_settings(AUTH_USER_MODEL='auth_tests.CustomUserNonUniqueUsername') @override_system_checks([check_user_model]) def test_username_non_unique(self): "A non-unique USERNAME_FIELD should raise a model validation error." @@ -613,7 +613,7 @@ class CustomUserModelValidationTestCase(SimpleTestCase): ] self.assertEqual(errors, expected) - @override_settings(AUTH_USER_MODEL='auth.CustomUserNonUniqueUsername', + @override_settings(AUTH_USER_MODEL='auth_tests.CustomUserNonUniqueUsername', AUTHENTICATION_BACKENDS=[ 'my.custom.backend', ]) diff --git a/tests/auth_tests/test_models.py b/tests/auth_tests/test_models.py index dd42e3b879..6256f484da 100644 --- a/tests/auth_tests/test_models.py +++ b/tests/auth_tests/test_models.py @@ -269,7 +269,7 @@ class IsActiveTestCase(TestCase): # the is_active flag is saved self.assertFalse(user_fetched.is_active) - @override_settings(AUTH_USER_MODEL='auth.IsActiveTestUser1') + @override_settings(AUTH_USER_MODEL='auth_tests.IsActiveTestUser1') def test_is_active_field_default(self): """ tests that the default value for is_active is provided