nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-29 10:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

middleware: tests: Drop some obsolete mock code

Browse Source 
- setup_helper was removed long ago.

Tests:

- Re-run unit tests.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
[vexch: Removed unused global variable setup_helper]
Signed-off-by: Veiko Aasa <veiko17@disroot.org>
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
This commit is contained in:
Sunil Mohan Adapa 2024-10-21 15:01:42 -07:00 committed by Veiko Aasa
parent 24382c298c
commit d85105a428
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plinth/tests/test_middleware.py
View File

@ -17,8 +17,6 @@ from plinth import app as app_module
from plinth.middleware import (AdminRequiredMiddleware, CommonErrorMiddleware, from plinth.middleware import (AdminRequiredMiddleware, CommonErrorMiddleware,
SetupMiddleware) SetupMiddleware)
setup_helper = None
@pytest.fixture(name='kwargs') @pytest.fixture(name='kwargs')
def fixture_kwargs(): def fixture_kwargs():
@ -76,14 +74,11 @@ class TestSetupMiddleware:
assert response is None assert response is None
@staticmethod @staticmethod
@patch('plinth.tests.test_middleware.setup_helper')
@patch('django.urls.resolve') @patch('django.urls.resolve')
@patch('django.urls.reverse', return_value='users:login') @patch('django.urls.reverse', return_value='users:login')
def test_module_is_up_to_date(_reverse, resolve, setup_helper_, app, def test_module_is_up_to_date(_reverse, resolve, app, middleware, kwargs):
middleware, kwargs):
"""Test that none is returned when module is up-to-date.""" """Test that none is returned when module is up-to-date."""
resolve.return_value.namespaces = ['mockapp'] resolve.return_value.namespaces = ['mockapp']
setup_helper_.is_finished = None
app.get_setup_state = lambda: app_module.App.SetupState.UP_TO_DATE app.get_setup_state = lambda: app_module.App.SetupState.UP_TO_DATE
request = RequestFactory().get('/plinth/mockapp') request = RequestFactory().get('/plinth/mockapp')
@ -92,20 +87,18 @@ class TestSetupMiddleware:
assert response is None assert response is None
@staticmethod @staticmethod
@patch('plinth.tests.test_middleware.setup_helper')
@patch('plinth.views.SetupView') @patch('plinth.views.SetupView')
@patch('django.urls.resolve') @patch('django.urls.resolve')
@patch('django.urls.reverse', return_value='users:login') @patch('django.urls.reverse', return_value='users:login')
@pytest.mark.django_db @pytest.mark.django_db
def test_module_view(_reverse, resolve, setup_view, setup_helper, app, def test_module_view(_reverse, resolve, setup_view, app, middleware,
middleware, kwargs): kwargs):
"""Test that only registered users can access the setup view.""" """Test that only registered users can access the setup view."""
resolve.return_value.namespaces = ['mockapp'] resolve.return_value.namespaces = ['mockapp']
view = Mock() view = Mock()
setup_view.as_view.return_value = view setup_view.as_view.return_value = view
request = RequestFactory().get('/plinth/mockapp') request = RequestFactory().get('/plinth/mockapp')
request.session = MagicMock() request.session = MagicMock()
setup_helper.is_finished = None
# Verify that anonymous users cannot access the setup page # Verify that anonymous users cannot access the setup page
request.user = AnonymousUser() request.user = AnonymousUser()