Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 06:20:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

BS5 Theme test fixes

Browse Source
This commit is contained in:
Aaron Kable 2023-10-27 11:33:08 +00:00 committed by Ariel Rin
parent 186fa1be03
commit 2a21599d45
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
allianceauth/groupmanagement/tests/test_views.py
View File

@ -64,7 +64,7 @@ class TestViews(TestCase):
content = response_content_to_str(response) content = response_content_to_str(response)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertIn('<a data-toggle="tab" href="#leave">', content) self.assertIn('id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave"', content)
self.assertIn('<div id="leave" class="tab-pane">', content) self.assertIn('<div id="leave" class="tab-pane">', content)
@override_settings(GROUPMANAGEMENT_AUTO_LEAVE=True) @override_settings(GROUPMANAGEMENT_AUTO_LEAVE=True)
@ -81,5 +81,5 @@ class TestViews(TestCase):
content = response_content_to_str(response) content = response_content_to_str(response)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertNotIn('<a data-toggle="tab" href="#leave">', content) self.assertNotIn('id="leave-tab" data-bs-toggle="tab" data-bs-target="#leave"', content)
self.assertNotIn('<div id="leave" class="tab-pane">', content) self.assertNotIn('<div id="leave" class="tab-pane">', content)

12
allianceauth/permissions_tool/tests.py
View File

@ -3,7 +3,7 @@ from django import urls
from django.contrib.auth.models import Group, Permission from django.contrib.auth.models import Group, Permission
from allianceauth.tests.auth_utils import AuthUtils from allianceauth.tests.auth_utils import AuthUtils
from allianceauth.menu.models import MenuItem
class PermissionsToolViewsTestCase(WebTest): class PermissionsToolViewsTestCase(WebTest):
def setUp(self): def setUp(self):
@ -34,13 +34,19 @@ class PermissionsToolViewsTestCase(WebTest):
self.member.user_permissions.add(self.permission) self.member.user_permissions.add(self.permission)
AuthUtils.connect_signals() AuthUtils.connect_signals()
# TODO find a nicer way to do this later
MenuItem.sync_hook_models()
def test_menu_item(self): def test_menu_item(self):
# If we change the side menu again this will fail again.
self.app.set_user(self.member) self.app.set_user(self.member)
response = self.app.get(urls.reverse('permissions_tool:overview')) response = self.app.get(urls.reverse('permissions_tool:overview'))
response_content = response.content.decode('utf-8') response_content = response.content.decode(response.charset)
self.assertInHTML('<li><a class="active" href="/permissions/overview/"><i class="fas fa-id-card fa-fw"></i> Permissions Audit</a></li>', response_content) self.assertIn("fa-id-card", response_content)
self.assertIn('href="/permissions/overview/"', response_content)
self.assertIn("Permissions Audit", response_content)
def test_permissions_overview(self): def test_permissions_overview(self):
self.app.set_user(self.member) self.app.set_user(self.member)

2
allianceauth/timerboard/tests.py
View File

@ -98,7 +98,7 @@ class TimerboardViewsTestCase(WebTest):
response = self.app.get(self.view_url) response = self.app.get(self.view_url)
context = response.context[-1] context = response.context
timers = context['timers'] timers = context['timers']
corp_timers = context['corp_timers'] corp_timers = context['corp_timers']

4
allianceauth/timerboard/views.py
View File

@ -67,6 +67,7 @@ class AddUpdateMixin:
class AddTimerView(TimerManagementView, AddUpdateMixin, CreateView): class AddTimerView(TimerManagementView, AddUpdateMixin, CreateView):
template_name_suffix = '_create_form' template_name_suffix = '_create_form'
form_class = TimerForm
def form_valid(self, form): def form_valid(self, form):
result = super().form_valid(form) result = super().form_valid(form)
@ -78,6 +79,7 @@ class AddTimerView(TimerManagementView, AddUpdateMixin, CreateView):
class EditTimerView(TimerManagementView, AddUpdateMixin, UpdateView): class EditTimerView(TimerManagementView, AddUpdateMixin, UpdateView):
template_name_suffix = '_update_form' template_name_suffix = '_update_form'
form_class = TimerForm
def form_valid(self, form): def form_valid(self, form):
messages.success(self.request, _('Saved changes to the timer.')) messages.success(self.request, _('Saved changes to the timer.'))
@ -85,7 +87,7 @@ class EditTimerView(TimerManagementView, AddUpdateMixin, UpdateView):
class RemoveTimerView(TimerManagementView, DeleteView): class RemoveTimerView(TimerManagementView, DeleteView):
pass form_class = TimerForm
def dashboard_timers(request): def dashboard_timers(request):