remove trailing whitespaces

This commit is contained in:
Peter Pfeufer
2021-05-17 09:46:11 +02:00
parent 10bd77d761
commit 8c3df89d52
146 changed files with 2088 additions and 2061 deletions

View File

@@ -9,17 +9,17 @@ from allianceauth.authentication.models import (
)
from allianceauth.eveonline.models import EveCharacter
from allianceauth.authentication.signals import (
state_member_alliances_changed,
state_member_characters_changed,
state_member_corporations_changed,
state_member_alliances_changed,
state_member_characters_changed,
state_member_corporations_changed,
state_saved,
reassess_on_profile_save,
assign_state_on_active_change,
check_state_on_character_update
)
from allianceauth.services.signals import (
m2m_changed_group_permissions,
m2m_changed_user_permissions,
m2m_changed_group_permissions,
m2m_changed_user_permissions,
m2m_changed_state_permissions,
m2m_changed_user_groups, disable_services_on_inactive,
process_main_character_change,
@@ -31,13 +31,13 @@ class AuthUtils:
"""Utilities for making it easier to create tests for Alliance Auth"""
@staticmethod
def _create_user(username):
def _create_user(username):
return User.objects.create(username=username)
@classmethod
def create_user(cls, username, disconnect_signals=False):
"""create a new user
username: Name of the user
disconnect_signals: whether to run process without signals
@@ -135,7 +135,7 @@ class AuthUtils:
m2m_changed.connect(state_member_alliances_changed, sender=State.member_alliances.through)
post_save.connect(state_saved, sender=State)
post_save.connect(reassess_on_profile_save, sender=UserProfile)
pre_save.connect(assign_state_on_active_change, sender=User)
pre_save.connect(assign_state_on_active_change, sender=User)
pre_save.connect(process_main_character_change, sender=UserProfile)
pre_save.connect(process_main_character_update, sender=EveCharacter)
post_save.connect(check_state_on_character_update, sender=EveCharacter)
@@ -161,15 +161,15 @@ class AuthUtils:
UserProfile.objects.update_or_create(user=user, defaults={'main_character': char})
@classmethod
def add_main_character_2(
def add_main_character_2(
cls,
user,
name,
character_id,
corp_id=2345,
corp_name='',
corp_ticker='',
alliance_id=None,
user,
name,
character_id,
corp_id=2345,
corp_name='',
corp_ticker='',
alliance_id=None,
alliance_name='',
disconnect_signals=False
):
@@ -194,10 +194,10 @@ class AuthUtils:
)
user.profile.main_character = char
user.profile.save()
if disconnect_signals:
cls.connect_signals()
return char
@classmethod
@@ -222,16 +222,16 @@ class AuthUtils:
@classmethod
def add_permissions_to_user(cls, perms, user, disconnect_signals=True) -> User:
"""add list of permissions to user
perms: list of Permission objects
user: user object
disconnect_signals: whether to run process without signals
"""
if disconnect_signals:
cls.disconnect_signals()
for perm in perms:
user.user_permissions.add(perm)
@@ -244,7 +244,7 @@ class AuthUtils:
@classmethod
def add_permission_to_user_by_name(
cls, perm, user, disconnect_signals=True
) -> User:
) -> User:
"""returns permission specified by qualified name
perm: Permission name as 'app_label.codename'

View File

@@ -12,10 +12,10 @@ from .auth_utils import AuthUtils
class TestAuthUtils(TestCase):
def test_can_create_user(self):
def test_can_create_user(self):
user = AuthUtils.create_user('Bruce Wayne')
self.assertTrue(User.objects.filter(username='Bruce Wayne').exists())
def test_can_add_main_character_2(self):
user = AuthUtils.create_user('Bruce Wayne')
character = AuthUtils.add_main_character_2(
@@ -30,11 +30,11 @@ class TestAuthUtils(TestCase):
)
expected = character
self.assertEqual(user.profile.main_character, expected)
def test_can_add_permission_to_group(self):
group = Group.objects.create(name='Dummy Group')
p = AuthUtils.get_permission_by_name('auth.group_management')
AuthUtils.add_permissions_to_groups([p], [group])
AuthUtils.add_permissions_to_groups([p], [group])
self.assertTrue(group.permissions.filter(pk=p.pk).exists())
def test_can_add_permission_to_user_by_name(self):
@@ -50,7 +50,7 @@ class TestGetPermissionByName(TestCase):
def test_can_get_permission_by_name(self):
expected = Permission.objects.get(
content_type__app_label='auth', codename='timer_management'
)
)
self.assertEqual(
AuthUtils.get_permission_by_name('auth.timer_management'), expected
)