From ef2996d56a843e254a022fabcccc5af7bdac197b Mon Sep 17 00:00:00 2001 From: Ben Thorner Date: Tue, 25 May 2021 17:00:45 +0100 Subject: [PATCH] Localise fixture to the only test that uses it --- tests/app/main/views/test_accept_invite.py | 11 +++++++++++ tests/conftest.py | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py index 36c2ec1a2..452ebba4e 100644 --- a/tests/app/main/views/test_accept_invite.py +++ b/tests/app/main/views/test_accept_invite.py @@ -22,6 +22,17 @@ def mock_no_users_for_service(mocker): mocker.patch('app.models.user.Users.client_method', return_value=[]) +@pytest.fixture(scope='function') +def mock_get_unknown_user_by_email(mocker, api_user_active): + api_user_active['id'] = USER_ONE_ID + + def _get_user(email_address): + api_user_active['email_address'] = email_address + return api_user_active + + return mocker.patch('app.user_api_client.get_user_by_email', side_effect=_get_user) + + 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 62fd5166a..85bd085af 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1500,17 +1500,6 @@ def mock_get_user_by_email(mocker, api_user_active): return mocker.patch('app.user_api_client.get_user_by_email', side_effect=_get_user) -@pytest.fixture(scope='function') -def mock_get_unknown_user_by_email(mocker, api_user_active): - api_user_active['id'] = USER_ONE_ID - - def _get_user(email_address): - api_user_active['email_address'] = email_address - return api_user_active - - return mocker.patch('app.user_api_client.get_user_by_email', side_effect=_get_user) - - @pytest.fixture(scope='function') def mock_dont_get_user_by_email(mocker): def _get_user(email_address):