Merge branch 'master' of https://github.com/Adarnof/allianceauth into custom_user

# Conflicts:
#	alliance_auth/settings.py.example
#	eveonline/views.py

Fix some tests.

alliance_auth/tests/auth_utils.py

@@ -1,11 +1,14 @@
 from __future__ import unicode_literals
 
-from django.db.models.signals import m2m_changed, pre_save
+from django.test import TestCase
+from django.db.models.signals import m2m_changed, pre_save, post_save
 from django.contrib.auth.models import User, Group
 from services.signals import m2m_changed_user_groups, pre_save_user
 from services.signals import m2m_changed_group_permissions, m2m_changed_user_permissions, m2m_changed_state_permissions
-from authentication.models import UserProfile, State, CharacterOwnership
+from authentication.models import UserProfile, State, get_guest_state
+from authentication.signals import state_member_alliances_changed, state_member_characters_changed, state_member_corporations_changed, state_saved
 from eveonline.models import EveCharacter
+from esi.models import Token
 
 
 class AuthUtils:
@@ -25,6 +28,61 @@ class AuthUtils:
             cls.connect_signals()
         return user
 
+    @staticmethod
+    def _create_state(name, priority, member_characters=None, member_corporations=None, member_alliances=None, public=False):
+        state = State.objects.create(name=name, priority=priority)
+        if member_characters:
+            state.member_characters.add(member_characters)
+        if member_corporations:
+            state.member_corporations.add(member_corporations)
+        if member_alliances:
+            state.member_alliances.add(member_alliances)
+        return state
+
+    @classmethod
+    def create_state(cls, name, priority, member_characters=None, member_corporations=None, member_alliances=None, public=False, disconnect_signals=False):
+        if disconnect_signals:
+            cls.disconnect_signals()
+        state = cls._create_state(name, priority, member_characters=member_characters, member_corporations=member_corporations, public=public, member_alliances=member_alliances)
+        if disconnect_signals:
+            cls.connect_signals()
+        return state
+
+    @classmethod
+    def get_member_state(cls):
+        try:
+            return State.objects.get(name='Member')
+        except State.DoesNotExist:
+            return cls.create_state('Member', 100, disconnect_signals=True)
+
+    @classmethod
+    def get_guest_state(cls):
+        cls.disconnect_signals()
+        state = get_guest_state()
+        cls.connect_signals()
+        return state
+
+    @classmethod
+    def assign_state(cls, user, state, disconnect_signals=False):
+        if disconnect_signals:
+            cls.disconnect_signals()
+        profile = user.profile
+        profile.state = state
+        profile.save()
+        if disconnect_signals:
+            cls.connect_signals()
+
+    @classmethod
+    def create_member(cls, username):
+        user = cls.create_user(username, disconnect_signals=True)
+        state = cls.get_member_state()
+        cls.assign_state(user, state, disconnect_signals=True)
+        cls.disconnect_signals()
+        g = Group.objects.get_or_create(name='Member')[0]
+        user.groups.add(g)
+        cls.connect_signals()
+        return user
+
     @classmethod
     def disconnect_signals(cls):
         m2m_changed.disconnect(m2m_changed_user_groups, sender=User.groups.through)
@@ -32,6 +90,10 @@ class AuthUtils:
         m2m_changed.disconnect(m2m_changed_user_permissions, sender=User.user_permissions.through)
         m2m_changed.disconnect(m2m_changed_state_permissions, sender=State.permissions.through)
         pre_save.disconnect(pre_save_user, sender=User)
+        m2m_changed.disconnect(state_member_corporations_changed, sender=State.member_corporations.through)
+        m2m_changed.disconnect(state_member_characters_changed, sender=State.member_characters.through)
+        m2m_changed.disconnect(state_member_alliances_changed, sender=State.member_alliances.through)
+        post_save.disconnect(state_saved, sender=State)
 
     @classmethod
     def connect_signals(cls):
@@ -40,6 +102,10 @@ class AuthUtils:
         m2m_changed.connect(m2m_changed_user_permissions, sender=User.user_permissions.through)
         m2m_changed.connect(m2m_changed_state_permissions, sender=State.permissions.through)
         pre_save.connect(pre_save_user, sender=User)
+        m2m_changed.connect(state_member_corporations_changed, sender=State.member_corporations.through)
+        m2m_changed.connect(state_member_characters_changed, sender=State.member_characters.through)
+        m2m_changed.connect(state_member_alliances_changed, sender=State.member_alliances.through)
+        post_save.connect(state_saved, sender=State)
 
     @classmethod
     def add_main_character(cls, user, name, character_id, corp_id='', corp_name='', corp_ticker='', alliance_id='',
@@ -69,4 +135,18 @@ class AuthUtils:
 
     @classmethod
     def add_permissions_to_state(cls, perms, states, disconnect_signals=True):
-        return cls.add_permissions_to_groups(perms, states, disconnect_signals=disconnect_signals)
+        return cls.add_permissions_to_groups(perms, states, disconnect_signals=disconnect_signals)
+
+
+class BaseViewTestCase(TestCase):
+    def setUp(self):
+        self.member = AuthUtils.create_member('auth_member')
+        self.member.set_password('password')
+        self.member.email = 'auth_member@example.com'
+        self.member.save()
+        AuthUtils.add_main_character(self.member, 'auth_member', '12345', corp_id='111', corp_name='Test Corporation',
+                                     corp_ticker='TESTR')
+
+    def login(self):
+        token = Token.objects.create(character_id='12345', character_name='auth_member', character_owner_hash='1', user=self.member, access_token='1')
+        self.client.login(token=token)