diff options
| author | Simon Charette <charette.s@gmail.com> | 2015-11-17 00:39:28 -0500 |
|---|---|---|
| committer | Simon Charette <charette.s@gmail.com> | 2016-01-06 20:00:07 -0500 |
| commit | a08fda2111d811aa53f11218fa03f3300dfff4cb (patch) | |
| tree | 0263cf99adf17c5123b3a53c686f637d5b40eda4 /tests/auth_tests/models | |
| parent | 3096f4b0829a005c67a14cc4bb6d345aa32672a1 (diff) | |
| download | django-a08fda2111d811aa53f11218fa03f3300dfff4cb.tar.gz | |
Fixed #25746 -- Isolated inlined test models registration.
Thanks to Tim for the review.
Diffstat (limited to 'tests/auth_tests/models')
| -rw-r--r-- | tests/auth_tests/models/__init__.py | 10 | ||||
| -rw-r--r-- | tests/auth_tests/models/invalid_models.py | 18 |
2 files changed, 3 insertions, 25 deletions
diff --git a/tests/auth_tests/models/__init__.py b/tests/auth_tests/models/__init__.py index ec6b6099db..3f3bd89793 100644 --- a/tests/auth_tests/models/__init__.py +++ b/tests/auth_tests/models/__init__.py @@ -1,14 +1,10 @@ from .custom_permissions import CustomPermissionsUser -from .invalid_models import ( - CustomUserBadRequiredFields, CustomUserNonListRequiredFields, - CustomUserNonUniqueUsername, -) +from .invalid_models import CustomUserNonUniqueUsername from .is_active import IsActiveTestUser1 from .uuid_pk import UUIDUser from .with_foreign_key import CustomUserWithFK, Email __all__ = ( - 'CustomPermissionsUser', 'CustomUserNonUniqueUsername', - 'CustomUserNonListRequiredFields', 'CustomUserBadRequiredFields', - 'CustomUserWithFK', 'Email', 'IsActiveTestUser1', 'UUIDUser', + 'CustomPermissionsUser', 'CustomUserWithFK', 'Email', + 'IsActiveTestUser1', 'UUIDUser', 'CustomUserNonUniqueUsername', ) diff --git a/tests/auth_tests/models/invalid_models.py b/tests/auth_tests/models/invalid_models.py index 4e2307ea59..123ed4d865 100644 --- a/tests/auth_tests/models/invalid_models.py +++ b/tests/auth_tests/models/invalid_models.py @@ -18,21 +18,3 @@ class CustomUserNonUniqueUsername(AbstractBaseUser): REQUIRED_FIELDS = ['email'] objects = UserManager() - - -class CustomUserNonListRequiredFields(AbstractBaseUser): - "A user with a non-list REQUIRED_FIELDS" - username = models.CharField(max_length=30, unique=True) - date_of_birth = models.DateField() - - USERNAME_FIELD = 'username' - REQUIRED_FIELDS = 'date_of_birth' - - -class CustomUserBadRequiredFields(AbstractBaseUser): - "A user with a USERNAME_FIELD that appears in REQUIRED_FIELDS (invalid)" - username = models.CharField(max_length=30, unique=True) - date_of_birth = models.DateField() - - USERNAME_FIELD = 'username' - REQUIRED_FIELDS = ['username', 'date_of_birth'] |
