From 1806ff2721589152bdaf89d36a2503bb8d6037ab Mon Sep 17 00:00:00 2001 From: Ben Thorner Date: Mon, 28 Jun 2021 17:52:11 +0100 Subject: [PATCH] DRY up fixtures to use their equivalent factory It's unclear if we really need the factory functions, but for now this avoids the fixture and the factory diverging. --- tests/conftest.py | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 77d5fcd79..002b098a8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1094,8 +1094,8 @@ def platform_admin_user_no_service_permissions(): @pytest.fixture(scope='function') -def api_user_active(fake_uuid): - return create_user(id=fake_uuid) +def api_user_active(): + return create_api_user_active() @pytest.fixture(scope='function') @@ -1124,9 +1124,7 @@ def api_nongov_user_active(fake_uuid): @pytest.fixture(scope='function') def active_user_with_permissions(fake_uuid): - return create_service_one_admin( - id=fake_uuid, - ) + return create_active_user_with_permissions() @pytest.fixture(scope='function') @@ -1176,39 +1174,18 @@ def active_user_with_permission_to_other_service( @pytest.fixture(scope='function') -def active_caseworking_user(fake_uuid): - return create_user( - id=fake_uuid, - email_address='caseworker@example.gov.uk', - permissions={SERVICE_ONE_ID: [ - 'send_texts', - 'send_emails', - 'send_letters', - ]}, - services=[SERVICE_ONE_ID], - ) +def active_caseworking_user(): + return create_active_caseworking_user() @pytest.fixture -def active_user_view_permissions(fake_uuid): - return create_service_one_user( - id=fake_uuid, - name='Test User With Permissions', - permissions={SERVICE_ONE_ID: ['view_activity']}, - ) +def active_user_view_permissions(): + return create_active_user_view_permissions() @pytest.fixture -def active_user_no_settings_permission(fake_uuid): - return create_service_one_user( - id=fake_uuid, - name='Test User With Permissions', - permissions={SERVICE_ONE_ID: [ - 'manage_templates', - 'manage_api_keys', - 'view_activity', - ]}, - ) +def active_user_no_settings_permission(): + return create_active_user_no_settings_permission() @pytest.fixture(scope='function')