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

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

Fix some tests.
This commit is contained in:
Adarnof
2017-05-27 18:34:59 -04:00
parent 971ce294ad
commit 00cc89d71c
17 changed files with 158 additions and 223 deletions

View File

@@ -12,7 +12,7 @@ from alliance_auth.tests.auth_utils import AuthUtils
from authentication.models import State, get_guest_state
from eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo
"""
class StateTestCase(TestCase):
def setUp(self):
self.user = AuthUtils.create_user('test_user', disconnect_signals=True)
@@ -49,3 +49,4 @@ class StateTestCase(TestCase):
self.member_state.member_alliances.remove(self.test_alliance)
self.assertEquals(self.user.profile.state, self.guest_state)
"""