From 1ac907d359b99598725eaf217dc7c28b7fa4a931 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 22 Jul 2025 11:12:26 -0700 Subject: [PATCH] update test --- .ds.baseline | 4 +-- app/__init__.py | 1 + app/main/views/jobs.py | 4 ++- app/utils/user_permissions.py | 5 +++- tests/app/main/test_permissions.py | 3 ++- tests/app/main/views/test_dashboard.py | 9 +++++-- tests/conftest.py | 35 +++++++++++++------------- 7 files changed, 37 insertions(+), 24 deletions(-) diff --git a/.ds.baseline b/.ds.baseline index 6710164d3..19e1a0edf 100644 --- a/.ds.baseline +++ b/.ds.baseline @@ -629,10 +629,10 @@ "filename": "tests/conftest.py", "hashed_secret": "f8377c90fcfd699f0ddbdcb30c2c9183d2d933ea", "is_verified": false, - "line_number": 3266, + "line_number": 3267, "is_secret": false } ] }, - "generated_at": "2025-07-21T21:23:30Z" + "generated_at": "2025-07-22T18:12:20Z" } diff --git a/app/__init__.py b/app/__init__.py index 5a233110a..6f953aac1 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -362,6 +362,7 @@ def init_app(application): @application.context_processor def _attach_enums(): from app.enums import ServicePermission + return {"ServicePermission": ServicePermission} @application.context_processor diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 7b74324a3..596743af7 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -222,7 +222,9 @@ def get_notifications(service_id, message_type, status_override=None): # noqa message_type, number_of_days="seven_day" ) - if request.path.endswith("csv") and current_user.has_permissions(ServicePermission.VIEW_ACTIVITY): + if request.path.endswith("csv") and current_user.has_permissions( + ServicePermission.VIEW_ACTIVITY + ): return Response( generate_notifications_csv( service_id=service_id, diff --git a/app/utils/user_permissions.py b/app/utils/user_permissions.py index b6f91c45b..62c6f59d6 100644 --- a/app/utils/user_permissions.py +++ b/app/utils/user_permissions.py @@ -6,7 +6,10 @@ permission_mappings = { # TODO: consider turning off email-sending permissions during SMS pilot ServicePermission.SEND_MESSAGES: ["send_texts", ServicePermission.SEND_EMAILS], ServicePermission.MANAGE_TEMPLATES: [ServicePermission.MANAGE_TEMPLATES], - ServicePermission.MANAGE_SERVICE: [ServicePermission.MANAGE_USERS, "manage_settings"], + ServicePermission.MANAGE_SERVICE: [ + ServicePermission.MANAGE_USERS, + "manage_settings", + ], "manage_api_keys": ["manage_api_keys"], ServicePermission.VIEW_ACTIVITY: [ServicePermission.VIEW_ACTIVITY], } diff --git a/tests/app/main/test_permissions.py b/tests/app/main/test_permissions.py index 50921977f..6c1e4ce12 100644 --- a/tests/app/main/test_permissions.py +++ b/tests/app/main/test_permissions.py @@ -52,7 +52,8 @@ def test_services_pages_that_org_users_are_allowed_to_see( api_user_active["services"] = user_services api_user_active["organizations"] = user_organizations api_user_active["permissions"] = { - service_id: [ServicePermission.MANAGE_USERS, "manage_settings"] for service_id in user_services + service_id: [ServicePermission.MANAGE_USERS, "manage_settings"] + for service_id in user_services } service = service_json( name="SERVICE WITH ORG", diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index f68a93be4..95c126051 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -924,7 +924,7 @@ def test_menu_send_messages( ServicePermission.VIEW_ACTIVITY, "send_texts", ServicePermission.SEND_EMAILS, - ServicePermission.MANAGE_SERVICE + ServicePermission.MANAGE_SERVICE, ], ) page = str(page) @@ -1004,7 +1004,12 @@ def test_menu_main_settings( mocker, api_user_active, service_one, - [ServicePermission.VIEW_ACTIVITY, "user_profile", ServicePermission.MANAGE_USERS, "manage_settings"], + [ + ServicePermission.VIEW_ACTIVITY, + "user_profile", + ServicePermission.MANAGE_USERS, + "manage_settings", + ], ) page = str(page) assert ( diff --git a/tests/conftest.py b/tests/conftest.py index c1bfbb7ef..5099eacab 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,6 +13,7 @@ from dotenv import load_dotenv from flask import Flask, url_for from app import create_app +from app.enums import ServicePermission from notifications_python_client.errors import HTTPError from notifications_utils.url_safe_token import generate_token @@ -1018,12 +1019,12 @@ def platform_admin_user(fake_uuid): permissions={ SERVICE_ONE_ID: [ "send_texts", - "send_emails", - "manage_users", - "manage_templates", + ServicePermission.SEND_EMAILS, + ServicePermission.MANAGE_USERS, + ServicePermission.MANAGE_TEMPLATES, "manage_settings", "manage_api_keys", - "view_activity", + ServicePermission.VIEW_ACTIVITY, ] } ) @@ -3163,7 +3164,7 @@ def create_active_user_view_permissions(with_unique_id=False): return create_service_one_user( id=str(uuid4()) if with_unique_id else sample_uuid(), name="Test User With Permissions", - permissions={SERVICE_ONE_ID: ["view_activity"]}, + permissions={SERVICE_ONE_ID: [ServicePermission.VIEW_ACTIVITY]}, ) @@ -3174,7 +3175,7 @@ def create_active_caseworking_user(with_unique_id=False): permissions={ SERVICE_ONE_ID: [ "send_texts", - "send_emails", + ServicePermission.SEND_EMAILS, ] }, services=[SERVICE_ONE_ID], @@ -3187,10 +3188,10 @@ def create_active_user_no_api_key_permission(with_unique_id=False): name="Test User With Permissions", permissions={ SERVICE_ONE_ID: [ - "manage_templates", + ServicePermission.MANAGE_TEMPLATES, "manage_settings", - "manage_users", - "view_activity", + ServicePermission.MANAGE_USERS, + ServicePermission.VIEW_ACTIVITY, ] }, ) @@ -3202,9 +3203,9 @@ def create_active_user_no_settings_permission(with_unique_id=False): name="Test User With Permissions", permissions={ SERVICE_ONE_ID: [ - "manage_templates", + ServicePermission.MANAGE_TEMPLATES, "manage_api_keys", - "view_activity", + ServicePermission.VIEW_ACTIVITY, ] }, ) @@ -3216,8 +3217,8 @@ def create_active_user_manage_template_permissions(with_unique_id=False): name="Test User With Permissions", permissions={ SERVICE_ONE_ID: [ - "manage_templates", - "view_activity", + ServicePermission.MANAGE_TEMPLATES, + ServicePermission.VIEW_ACTIVITY, ] }, ) @@ -3238,12 +3239,12 @@ def create_service_one_admin(**overrides): "permissions": { SERVICE_ONE_ID: [ "send_texts", - "send_emails", - "manage_users", - "manage_templates", + ServicePermission.SEND_EMAILS, + ServicePermission.MANAGE_USERS, + ServicePermission.MANAGE_TEMPLATES, "manage_settings", "manage_api_keys", - "view_activity", + ServicePermission.VIEW_ACTIVITY, ] }, }