diff --git a/allianceauth/permissions_tool/tests.py b/allianceauth/permissions_tool/tests.py
index b432fa29..42b35ddf 100644
--- a/allianceauth/permissions_tool/tests.py
+++ b/allianceauth/permissions_tool/tests.py
@@ -10,7 +10,6 @@ from allianceauth.tests.auth_utils import AuthUtils
class PermissionsToolViewsTestCase(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()
self.none_user = AuthUtils.create_user('none_user', disconnect_signals=True)
@@ -18,7 +17,6 @@ class PermissionsToolViewsTestCase(TestCase):
self.none_user3 = AuthUtils.create_user('none_user3', disconnect_signals=True)
self.no_perm_user = AuthUtils.create_user('no_perm_user', disconnect_signals=True)
- self.no_perm_user.set_password('password')
AuthUtils.disconnect_signals()
self.no_perm_group = Group.objects.create(name="No Permission Group")
@@ -38,17 +36,16 @@ class PermissionsToolViewsTestCase(TestCase):
AuthUtils.connect_signals()
def test_menu_item(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
response = self.client.get(urls.reverse('permissions_tool:overview'))
- response_content = str(response.content, encoding='utf8')
+ response_content = response.content.decode('utf-8')
- self.assertInHTML(
- '
Permissions Audit',
- response_content)
+ self.assertInHTML(''
+ ' Permissions Audit', response_content)
def test_permissions_overview(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
response = self.client.get(urls.reverse('permissions_tool:overview'))
@@ -63,22 +60,25 @@ class PermissionsToolViewsTestCase(TestCase):
for perm in response.context['permissions']:
if perm['permission'] == self.permission:
tested_context = True
- self.assertDictContainsSubset({'users': 1}, perm)
- self.assertDictContainsSubset({'groups': 1}, perm)
- self.assertDictContainsSubset({'group_users': 3}, perm)
+ self.assertIn('users', perm)
+ self.assertEqual(perm['users'], 1)
+ self.assertIn('groups', perm)
+ self.assertEqual(perm['groups'], 1)
+ self.assertIn('group_users', perm)
+ self.assertEqual(perm['group_users'], 3)
break
self.assertTrue(tested_context)
def test_permissions_overview_perms(self):
# Ensure permission effectively denys access
- self.client.login(username=self.no_perm_user.username, password='password')
+ self.client.force_login(self.no_perm_user)
response = self.client.get(urls.reverse('permissions_tool:overview'))
self.assertEqual(response.status_code, 302)
def test_permissions_audit(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
response = self.client.get(urls.reverse('permissions_tool:audit',
kwargs={
@@ -99,7 +99,7 @@ class PermissionsToolViewsTestCase(TestCase):
def test_permissions_audit_perms(self):
# Ensure permission effectively denys access
- self.client.login(username=self.no_perm_user.username, password='password')
+ self.client.force_login(self.no_perm_user)
response = self.client.get(urls.reverse('permissions_tool:audit',
kwargs={
diff --git a/allianceauth/services/modules/discord/tests.py b/allianceauth/services/modules/discord/tests.py
index db255028..e52044fc 100644
--- a/allianceauth/services/modules/discord/tests.py
+++ b/allianceauth/services/modules/discord/tests.py
@@ -141,12 +141,10 @@ class DiscordHooksTestCase(TestCase):
class DiscordViewsTestCase(TestCase):
def setUp(self):
self.member = AuthUtils.create_member('auth_member')
- self.member.set_password('password')
- self.member.save()
add_permissions()
def login(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
@mock.patch(MODULE_PATH + '.views.DiscordOAuthManager')
def test_activate(self, manager):
diff --git a/allianceauth/services/modules/discourse/tests.py b/allianceauth/services/modules/discourse/tests.py
index 189a0c55..38eda84f 100644
--- a/allianceauth/services/modules/discourse/tests.py
+++ b/allianceauth/services/modules/discourse/tests.py
@@ -113,14 +113,12 @@ class DiscourseHooksTestCase(TestCase):
class DiscourseViewsTestCase(TestCase):
def setUp(self):
self.member = AuthUtils.create_member('auth_member')
- self.member.set_password('password')
- self.member.save()
AuthUtils.add_main_character(self.member, 'auth_member', '12345', corp_id='111', corp_name='Test Corporation')
add_permissions()
@mock.patch(MODULE_PATH + '.tasks.DiscourseManager')
def test_sso_member(self, manager):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
data = {'sso': 'bm9uY2U9Y2I2ODI1MWVlZmI1MjExZTU4YzAwZmYxMzk1ZjBjMGI%3D%0A',
'sig': '2828aa29899722b35a2f191d34ef9b3ce695e0e6eeec47deb46d588d70c7cb56'}
response = self.client.get('/discourse/sso', data=data, follow=False)
diff --git a/allianceauth/services/modules/ips4/tests.py b/allianceauth/services/modules/ips4/tests.py
index 613c95d5..e568f0bd 100644
--- a/allianceauth/services/modules/ips4/tests.py
+++ b/allianceauth/services/modules/ips4/tests.py
@@ -68,14 +68,13 @@ class Ips4HooksTestCase(TestCase):
class Ips4ViewsTestCase(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')
add_permissions()
def login(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
@mock.patch(MODULE_PATH + '.views.Ips4Manager')
def test_activate(self, manager):
diff --git a/allianceauth/services/modules/market/tests.py b/allianceauth/services/modules/market/tests.py
index fa463925..71674fe9 100644
--- a/allianceauth/services/modules/market/tests.py
+++ b/allianceauth/services/modules/market/tests.py
@@ -96,14 +96,13 @@ class MarketHooksTestCase(TestCase):
class MarketViewsTestCase(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')
add_permissions()
def login(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
@mock.patch(MODULE_PATH + '.views.MarketManager')
def test_activate(self, manager):
diff --git a/allianceauth/services/modules/mumble/tests.py b/allianceauth/services/modules/mumble/tests.py
index 4cd16cc0..84308d8b 100644
--- a/allianceauth/services/modules/mumble/tests.py
+++ b/allianceauth/services/modules/mumble/tests.py
@@ -119,7 +119,6 @@ class MumbleHooksTestCase(TestCase):
class MumbleViewsTestCase(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',
@@ -127,7 +126,7 @@ class MumbleViewsTestCase(TestCase):
add_permissions()
def login(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
def test_activate(self):
self.login()
diff --git a/allianceauth/services/modules/openfire/tests.py b/allianceauth/services/modules/openfire/tests.py
index 503c948c..a2c50a85 100644
--- a/allianceauth/services/modules/openfire/tests.py
+++ b/allianceauth/services/modules/openfire/tests.py
@@ -123,14 +123,13 @@ class OpenfireHooksTestCase(TestCase):
class OpenfireViewsTestCase(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')
add_permissions()
def login(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
@mock.patch(MODULE_PATH + '.tasks.OpenfireManager')
@mock.patch(MODULE_PATH + '.views.OpenfireManager')
diff --git a/allianceauth/services/modules/phpbb3/tests.py b/allianceauth/services/modules/phpbb3/tests.py
index 42feb087..cd5de997 100644
--- a/allianceauth/services/modules/phpbb3/tests.py
+++ b/allianceauth/services/modules/phpbb3/tests.py
@@ -123,14 +123,13 @@ class Phpbb3HooksTestCase(TestCase):
class Phpbb3ViewsTestCase(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')
add_permissions()
def login(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
@mock.patch(MODULE_PATH + '.tasks.Phpbb3Manager')
@mock.patch(MODULE_PATH + '.views.Phpbb3Manager')
diff --git a/allianceauth/services/modules/seat/tests.py b/allianceauth/services/modules/seat/tests.py
index 54a2db0b..ebd13049 100644
--- a/allianceauth/services/modules/seat/tests.py
+++ b/allianceauth/services/modules/seat/tests.py
@@ -127,14 +127,13 @@ class SeatHooksTestCase(TestCase):
class SeatViewsTestCase(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')
add_permissions()
def login(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
@mock.patch(MODULE_PATH + '.tasks.SeatManager')
@mock.patch(MODULE_PATH + '.views.SeatManager')
diff --git a/allianceauth/services/modules/smf/tests.py b/allianceauth/services/modules/smf/tests.py
index c185c407..ed58e818 100644
--- a/allianceauth/services/modules/smf/tests.py
+++ b/allianceauth/services/modules/smf/tests.py
@@ -123,14 +123,13 @@ class SmfHooksTestCase(TestCase):
class SmfViewsTestCase(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')
add_permissions()
def login(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
@mock.patch(MODULE_PATH + '.tasks.SmfManager')
@mock.patch(MODULE_PATH + '.views.SmfManager')
diff --git a/allianceauth/services/modules/teamspeak3/tests.py b/allianceauth/services/modules/teamspeak3/tests.py
index f17b5774..62ac4d88 100644
--- a/allianceauth/services/modules/teamspeak3/tests.py
+++ b/allianceauth/services/modules/teamspeak3/tests.py
@@ -136,7 +136,6 @@ class Teamspeak3ViewsTestCase(TestCase):
# Inert signals before setup begins
with mock.patch(MODULE_PATH + '.signals.trigger_all_ts_update') as trigger_all_ts_update:
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')
@@ -150,7 +149,7 @@ class Teamspeak3ViewsTestCase(TestCase):
def login(self, user=None, password=None):
if user is None:
user = self.member
- self.client.login(username=user.username, password=password if password else 'password')
+ self.client.force_login(user)
@mock.patch(MODULE_PATH + '.forms.Teamspeak3Manager')
@mock.patch(MODULE_PATH + '.views.Teamspeak3Manager')
diff --git a/allianceauth/services/modules/xenforo/tests.py b/allianceauth/services/modules/xenforo/tests.py
index 333e10b9..f0814359 100644
--- a/allianceauth/services/modules/xenforo/tests.py
+++ b/allianceauth/services/modules/xenforo/tests.py
@@ -99,14 +99,13 @@ class XenforoHooksTestCase(TestCase):
class XenforoViewsTestCase(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')
add_permissions()
def login(self):
- self.client.login(username=self.member.username, password='password')
+ self.client.force_login(self.member)
@mock.patch(MODULE_PATH + '.tasks.XenForoManager')
@mock.patch(MODULE_PATH + '.views.XenForoManager')
diff --git a/allianceauth/tests/auth_utils.py b/allianceauth/tests/auth_utils.py
index 5ae1d6a9..cc27676a 100644
--- a/allianceauth/tests/auth_utils.py
+++ b/allianceauth/tests/auth_utils.py
@@ -142,7 +142,6 @@ class AuthUtils:
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',
@@ -150,4 +149,4 @@ class BaseViewTestCase(TestCase):
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)
\ No newline at end of file
+ self.client.login(token=token)
diff --git a/test_allianceauth/settings.py b/test_allianceauth/settings.py
index 01b29444..a542b06e 100644
--- a/test_allianceauth/settings.py
+++ b/test_allianceauth/settings.py
@@ -362,7 +362,7 @@ FLEETUP_API_ID = os.environ.get('AA_FLEETUP_API_ID', '')
FLEETUP_GROUP_ID = os.environ.get('AA_FLEETUP_GROUP_ID', '')
PASSWORD_HASHERS = [
- 'django.contrib.auth.hashers.MD5PasswordHasher',
+ 'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
]