From 39689e2a4f631f387539329f38250b21de42b56f Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 2 Jan 2019 03:46:14 -0400 Subject: [PATCH] Cleanup autoadmin app code Add keyword arguments. Modernize view tests by using GenericViewCase class. Signed-off-by: Roberto Rosario --- mayan/apps/autoadmin/auth/allauth.py | 14 ++++++++------ mayan/apps/autoadmin/migrations/0001_initial.py | 2 +- mayan/apps/autoadmin/settings.py | 2 +- mayan/apps/autoadmin/tests/test_views.py | 15 +++++++-------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/mayan/apps/autoadmin/auth/allauth.py b/mayan/apps/autoadmin/auth/allauth.py index 8744093728..433e0ae529 100644 --- a/mayan/apps/autoadmin/auth/allauth.py +++ b/mayan/apps/autoadmin/auth/allauth.py @@ -40,16 +40,18 @@ class AutoadminAccountAdapter(DefaultAccountAdapter): Give superuser privileges automagically if the email address of a user confirming their email is listed in ``settings.ADMINS``. """ - super(AutoadminAccountAdapter, - self).confirm_email(request, email_address) + super(AutoadminAccountAdapter, self).confirm_email( + request=request, email_address=email_address + ) if email_address.email in ADMIN_EMAIL_ADDRESSES: user = email_address.user user.is_staff = user.is_superuser = True user.save() - messages.add_message( - request, messages.INFO, - _('Welcome Admin! You have been given superuser privileges. ' - 'Use them with caution.') + messages.info( + request=request, message=_( + 'Welcome Admin! You have been given superuser ' + 'privileges. Use them with caution.' + ) ) diff --git a/mayan/apps/autoadmin/migrations/0001_initial.py b/mayan/apps/autoadmin/migrations/0001_initial.py index d41e526214..ac010e069a 100644 --- a/mayan/apps/autoadmin/migrations/0001_initial.py +++ b/mayan/apps/autoadmin/migrations/0001_initial.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from django.conf import settings -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/autoadmin/settings.py b/mayan/apps/autoadmin/settings.py index 709869099c..d74b9b0d74 100644 --- a/mayan/apps/autoadmin/settings.py +++ b/mayan/apps/autoadmin/settings.py @@ -6,7 +6,7 @@ from mayan.apps.smart_settings import Namespace from .literals import DEFAULT_EMAIL, DEFAULT_PASSWORD, DEFAULT_USERNAME -namespace = Namespace(name='autoadmin', label=_('Auto administrator')) +namespace = Namespace(label=_('Auto administrator'), name='autoadmin') setting_email = namespace.add_setting( global_name='AUTOADMIN_EMAIL', default=DEFAULT_EMAIL, diff --git a/mayan/apps/autoadmin/tests/test_views.py b/mayan/apps/autoadmin/tests/test_views.py index c72afa1700..23cc7e1ca1 100644 --- a/mayan/apps/autoadmin/tests/test_views.py +++ b/mayan/apps/autoadmin/tests/test_views.py @@ -1,9 +1,7 @@ from __future__ import unicode_literals -from django.test import TestCase -from django.urls import reverse - from mayan.apps.common.settings import setting_home_view +from mayan.apps.common.tests import GenericViewTestCase from mayan.apps.common.tests.utils import mute_stdout from ..models import AutoAdminSingleton @@ -11,15 +9,16 @@ from ..models import AutoAdminSingleton from .literals import TEST_FIRST_TIME_LOGIN_TEXT, TEST_MOCK_VIEW_TEXT -class AutoAdminViewCase(TestCase): +class AutoAdminViewCase(GenericViewTestCase): + auto_create_group = False + auto_create_users = False + def setUp(self): with mute_stdout(): AutoAdminSingleton.objects.create_autoadmin() def _request_home_view(self): - return self.client.get( - reverse(setting_home_view.value), follow=True - ) + return self.get(viewname=setting_home_view.value, follow=True) def test_login_302_view(self): response = self._request_home_view() @@ -31,7 +30,7 @@ class AutoAdminViewCase(TestCase): def test_login_ok_view(self): autoadmin = AutoAdminSingleton.objects.get() - logged_in = self.client.login( + logged_in = self.login( username=autoadmin.account, password=autoadmin.password )