diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index 2219358e7..05fef237c 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -2235,7 +2235,7 @@ def test_view_only_user_cant_approve_broadcasts_they_created( client_request, service_one, fake_uuid, - active_user_broadcast_permissions, + active_user_create_broadcasts_permission, active_user_view_permissions, ): mocker.patch( @@ -2251,11 +2251,11 @@ def test_view_only_user_cant_approve_broadcasts_they_created( ) client_request.login(active_user_view_permissions) - # active_user_view_permissions and active_user_broadcast_permissions have the same + # active_user_view_permissions and active_user_create_broadcasts_permission have the same # id. This mocks the same user being returned, but with different permissions each time. mocker.patch('app.user_api_client.get_user', side_effect=[ active_user_view_permissions, # Current user - active_user_broadcast_permissions, # User who created broadcast + active_user_create_broadcasts_permission, # User who created broadcast ]) service_one['permissions'] += ['broadcast'] service_one['restriced'] = False @@ -2296,7 +2296,7 @@ def test_user_without_approve_permission_cant_approve_broadcast_created_by_someo mocker, client_request, service_one, - active_user_broadcast_permissions, + active_user_create_broadcasts_permission, mock_get_broadcast_template, fake_uuid, is_service_training_mode, @@ -2317,7 +2317,7 @@ def test_user_without_approve_permission_cant_approve_broadcast_created_by_someo client_request.login(current_user) mocker.patch('app.user_api_client.get_user', side_effect=[ current_user, # Current user - active_user_broadcast_permissions, # User who created broadcast + active_user_create_broadcasts_permission, # User who created broadcast ]) service_one['permissions'] += ['broadcast'] service_one['restricted'] = is_service_training_mode diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index 2982673bc..4fb368642 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -202,21 +202,29 @@ def test_should_show_overview_page_for_broadcast_service( mock_get_template_folders, service_one, active_user_view_permissions, - active_user_broadcast_permissions, + active_user_create_broadcasts_permission, + active_user_approve_broadcasts_permission, ): service_one['permissions'].append('broadcast') mocker.patch('app.models.user.Users.client_method', return_value=[ - active_user_broadcast_permissions, + active_user_create_broadcasts_permission, + active_user_approve_broadcasts_permission, active_user_view_permissions, ]) page = client_request.get('main.manage_users', service_id=SERVICE_ONE_ID) assert normalize_spaces(page.select('.user-list-item')[0].text) == ( - 'Test User (you) ' - 'Can Add and edit templates ' + 'Test User Create Broadcasts Permission (you) ' + 'Cannot Add and edit templates ' 'Can Create new alerts ' - 'Can Approve alerts' + 'Cannot Approve alerts' ) assert normalize_spaces(page.select('.user-list-item')[1].text) == ( + 'Test User Approve Broadcasts Permission (you) ' + 'Cannot Add and edit templates ' + 'Cannot Create new alerts ' + 'Can Approve alerts' + ) + assert normalize_spaces(page.select('.user-list-item')[2].text) == ( 'Test User With Permissions (you) ' 'Cannot Add and edit templates ' 'Cannot Create new alerts ' diff --git a/tests/conftest.py b/tests/conftest.py index 8ff0bb568..552cb1dfd 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1137,22 +1137,6 @@ def active_user_approve_broadcasts_permission(): return create_active_user_approve_broadcasts_permissions() -@pytest.fixture(scope='function') -def active_user_broadcast_permissions(fake_uuid): - return create_service_one_user( - id=fake_uuid, - permissions={SERVICE_ONE_ID: [ - 'view_activity', - 'manage_templates', - 'create_broadcasts', - 'reject_broadcasts', - 'cancel_broadcasts', - 'approve_broadcasts', - ]}, - auth_type='webauthn_auth', - ) - - @pytest.fixture(scope='function') def active_user_with_session(fake_uuid): return create_service_one_admin( @@ -3624,7 +3608,6 @@ def create_active_user_create_broadcasts_permissions(with_unique_id=False): id=str(uuid4()) if with_unique_id else sample_uuid(), name='Test User Create Broadcasts Permission', permissions={SERVICE_ONE_ID: [ - 'manage_templates', 'create_broadcasts', 'reject_broadcasts', 'cancel_broadcasts',