From 71cbc00a3d0f802c4a6fe09201bfc6334e15728b Mon Sep 17 00:00:00 2001 From: Ben Thorner Date: Tue, 25 May 2021 17:55:52 +0100 Subject: [PATCH] Localise and simplify fixture to invite tests This isn't used anywhere else. --- tests/app/main/views/test_accept_invite.py | 5 +++++ tests/conftest.py | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py index f3b3524e1..1fff1a06f 100644 --- a/tests/app/main/views/test_accept_invite.py +++ b/tests/app/main/views/test_accept_invite.py @@ -25,6 +25,11 @@ def mock_get_existing_user_by_email(mocker, api_user_active): return mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_active) +@pytest.fixture(scope='function') +def mock_check_invite_token(mocker, sample_invite): + return mocker.patch('app.invite_api_client.check_token', return_value=sample_invite) + + def test_existing_user_accept_invite_calls_api_and_redirects_to_dashboard( client, service_one, diff --git a/tests/conftest.py b/tests/conftest.py index 85bd085af..ad3e3d02f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2482,14 +2482,6 @@ def mock_get_invites_without_manage_permission(mocker, service_one, sample_invit return mocker.patch('app.models.user.InvitedUsers.client_method', side_effect=_get_invites) -@pytest.fixture(scope='function') -def mock_check_invite_token(mocker, sample_invite): - def _check_token(token): - return sample_invite - - return mocker.patch('app.invite_api_client.check_token', side_effect=_check_token) - - @pytest.fixture(scope='function') def mock_accept_invite(mocker, sample_invite): def _accept(service_id, invite_id):