From 0a864c2f07d6517e6e2d6a82d3f141112358467a Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 31 Jan 2019 06:11:20 -0400 Subject: [PATCH] Update ADMIN references to SUPERUSER Signed-off-by: Roberto Rosario --- mayan/apps/user_management/tests/__init__.py | 3 +-- mayan/apps/user_management/tests/literals.py | 8 ++++---- mayan/apps/user_management/tests/mixins.py | 16 ++++++++-------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/mayan/apps/user_management/tests/__init__.py b/mayan/apps/user_management/tests/__init__.py index 33ff9e78ba..8b13789179 100644 --- a/mayan/apps/user_management/tests/__init__.py +++ b/mayan/apps/user_management/tests/__init__.py @@ -1,2 +1 @@ -from .literals import * # NOQA -from .mixins import * # NOQA + diff --git a/mayan/apps/user_management/tests/literals.py b/mayan/apps/user_management/tests/literals.py index 9b9b7db24a..9998b2f8f0 100644 --- a/mayan/apps/user_management/tests/literals.py +++ b/mayan/apps/user_management/tests/literals.py @@ -5,12 +5,12 @@ __all__ = ( 'TEST_USER_PASSWORD', 'TEST_USER_PASSWORD_EDITED', 'TEST_USER_USERNAME' ) -TEST_CASE_ADMIN_EMAIL = 'case_admin@example.com' -TEST_CASE_ADMIN_PASSWORD = 'test case admin password' -TEST_CASE_ADMIN_USERNAME = 'test_case_admin' - TEST_CASE_GROUP_NAME = 'test case group' +TEST_CASE_SUPERUSER_EMAIL = 'test_case_superuser@example.com' +TEST_CASE_SUPERUSER_PASSWORD = 'test case superuser password' +TEST_CASE_SUPERUSER_USERNAME = 'test_case_superuser' + TEST_CASE_USER_EMAIL = 'test_case_user@example.com' TEST_CASE_USER_PASSWORD = 'test case user password' TEST_CASE_USER_USERNAME = 'test_case_user' diff --git a/mayan/apps/user_management/tests/mixins.py b/mayan/apps/user_management/tests/mixins.py index cd2c26ec43..6a5dde7534 100644 --- a/mayan/apps/user_management/tests/mixins.py +++ b/mayan/apps/user_management/tests/mixins.py @@ -4,7 +4,7 @@ from django.contrib.auth import get_user_model from django.contrib.auth.models import Group from .literals import ( - TEST_CASE_ADMIN_EMAIL, TEST_CASE_ADMIN_PASSWORD, TEST_CASE_ADMIN_USERNAME, + TEST_CASE_SUPERUSER_EMAIL, TEST_CASE_SUPERUSER_PASSWORD, TEST_CASE_SUPERUSER_USERNAME, TEST_CASE_GROUP_NAME, TEST_GROUP_NAME_EDITED, TEST_CASE_USER_EMAIL, TEST_CASE_USER_PASSWORD, TEST_CASE_USER_USERNAME, TEST_GROUP_NAME, TEST_USER_EMAIL, TEST_USER_USERNAME, TEST_USER_USERNAME_EDITED, @@ -41,7 +41,7 @@ class UserTestCaseMixin(object): if self.auto_login_user: self.login_user() - elif self.create_test_case_superuser: + if self.create_test_case_superuser: self._create_test_case_superuser() if self.auto_login_superuser: @@ -56,8 +56,8 @@ class UserTestCaseMixin(object): def _create_test_case_superuser(self): self._test_case_superuser = get_user_model().objects.create_superuser( - username=TEST_CASE_ADMIN_USERNAME, email=TEST_CASE_ADMIN_EMAIL, - password=TEST_CASE_ADMIN_PASSWORD + username=TEST_CASE_SUPERUSER_USERNAME, email=TEST_CASE_SUPERUSER_EMAIL, + password=TEST_CASE_SUPERUSER_PASSWORD ) def _create_test_case_user(self): @@ -73,8 +73,8 @@ class UserTestCaseMixin(object): def login_superuser(self): self.login( - username=TEST_CASE_ADMIN_USERNAME, - password=TEST_CASE_ADMIN_PASSWORD + username=TEST_CASE_SUPERUSER_USERNAME, + password=TEST_CASE_SUPERUSER_PASSWORD ) def login_user(self): @@ -132,8 +132,8 @@ class GroupTestMixin(object): class UserTestMixin(object): def _create_test_superuser(self): self.test_superuser = get_user_model().objects.create_superuser( - username=TEST_CASE_ADMIN_USERNAME, email=TEST_CASE_ADMIN_EMAIL, - password=TEST_CASE_ADMIN_PASSWORD + username=TEST_CASE_SUPERUSER_USERNAME, email=TEST_CASE_SUPERUSER_EMAIL, + password=TEST_CASE_SUPERUSER_PASSWORD ) def _create_test_user(self):