From 4bc91f238151934830f1798e33c3d8b7a15fe1a5 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Wed, 14 Jun 2017 16:12:56 -0400 Subject: [PATCH] Fix unit tests. Discord still failing. --- alliance_auth/tests/test_settings.py | 2 +- .../templates/permissions_tool/audit.html | 2 +- permissions_tool/tests.py | 39 +++++++++---------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/alliance_auth/tests/test_settings.py b/alliance_auth/tests/test_settings.py index 04ace733..c3836c94 100644 --- a/alliance_auth/tests/test_settings.py +++ b/alliance_auth/tests/test_settings.py @@ -170,7 +170,7 @@ CACHES = { } } -AUTHENTICATION_BACKENDS = ['authentication.backends.StateBackend'] +AUTHENTICATION_BACKENDS = ['authentication.backends.StateBackend', 'django.contrib.auth.backends.ModelBackend'] ##################################################### ## diff --git a/permissions_tool/templates/permissions_tool/audit.html b/permissions_tool/templates/permissions_tool/audit.html index d3ad50a9..69657f8e 100644 --- a/permissions_tool/templates/permissions_tool/audit.html +++ b/permissions_tool/templates/permissions_tool/audit.html @@ -8,7 +8,7 @@ {% block content %}

{% trans "Permissions Audit" %}: {{ permission.permission.codename }}

- + {% trans "Back" %} diff --git a/permissions_tool/tests.py b/permissions_tool/tests.py index fcd1b602..0ad8c26d 100644 --- a/permissions_tool/tests.py +++ b/permissions_tool/tests.py @@ -9,7 +9,7 @@ except ImportError: from django.test import TestCase from django import urls -from django.contrib.auth.models import User, Group, Permission +from django.contrib.auth.models import Group, Permission from alliance_auth.tests.auth_utils import AuthUtils @@ -47,21 +47,20 @@ class PermissionsToolViewsTestCase(TestCase): AuthUtils.connect_signals() def test_menu_item(self): - self.client.login(username=self.member.username, password='password') - - response = self.client.get(urls.reverse('permissions_overview')) + response = self.client.get(urls.reverse('permissions_tool:overview')) response_content = response.content if six.PY3: response_content = str(response_content, encoding='utf8') - 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') - response = self.client.get(urls.reverse('permissions_overview')) + response = self.client.get(urls.reverse('permissions_tool:overview')) self.assertEqual(response.status_code, 200) self.assertTemplateUsed('permissions_tool/overview.html') @@ -84,19 +83,19 @@ class PermissionsToolViewsTestCase(TestCase): # Ensure permission effectively denys access self.client.login(username=self.no_perm_user.username, password='password') - response = self.client.get(urls.reverse('permissions_overview')) + 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') - response = self.client.get(urls.reverse('permissions_audit', - kwargs={ - 'app_label': self.permission.content_type.app_label, - 'model': self.permission.content_type.model, - 'codename': self.permission.codename, - })) + response = self.client.get(urls.reverse('permissions_tool:audit', + kwargs={ + 'app_label': self.permission.content_type.app_label, + 'model': self.permission.content_type.model, + 'codename': self.permission.codename, + })) self.assertTemplateUsed('permissions_tool/audit.html') self.assertTemplateUsed('permissions_tool/audit_row.html') @@ -112,11 +111,11 @@ class PermissionsToolViewsTestCase(TestCase): # Ensure permission effectively denys access self.client.login(username=self.no_perm_user.username, password='password') - response = self.client.get(urls.reverse('permissions_audit', - kwargs={ - 'app_label': self.permission.content_type.app_label, - 'model': self.permission.content_type.model, - 'codename': self.permission.codename, - })) + response = self.client.get(urls.reverse('permissions_tool:audit', + kwargs={ + 'app_label': self.permission.content_type.app_label, + 'model': self.permission.content_type.model, + 'codename': self.permission.codename, + })) self.assertEqual(response.status_code, 302)