From 416e4be27b11eb8fdb205616c8c2777f45904244 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 18 Feb 2016 16:55:58 -0500 Subject: [PATCH] Change test util to handle custom user models This should handle custom user models that use either username or email as the 'USERNAME_FIELD' --- wagtail/tests/utils.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py index e19da20fa3..4973a7939a 100644 --- a/wagtail/tests/utils.py +++ b/wagtail/tests/utils.py @@ -14,11 +14,19 @@ from django.utils.text import slugify class WagtailTestUtils(object): def login(self): + user_model = get_user_model() # Create a user - user = get_user_model().objects.create_superuser(username='test', email='test@email.com', password='password') + user_data = {} + user_data[user_model.USERNAME_FIELD] = 'test@email.com' + user_data['password'] = 'password' + + for field in user_model.REQUIRED_FIELDS: + user_data[field] = field + + user = user_model.objects.create_superuser(**user_data) # Login - self.client.login(username='test', password='password') + self.client.login(password='password', **{user_model.USERNAME_FIELD: 'test@email.com'}) return user