darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-02 17:48:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

update test

Browse Source
This commit is contained in:
Beverly Nguyen
2025-07-22 11:12:26 -07:00
parent c1d186896e
commit 1ac907d359
7 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ds.baseline
View File

@@ -629,10 +629,10 @@
"filename": "tests/conftest.py", "filename": "tests/conftest.py",
"hashed_secret": "f8377c90fcfd699f0ddbdcb30c2c9183d2d933ea", "hashed_secret": "f8377c90fcfd699f0ddbdcb30c2c9183d2d933ea",
"is_verified": false, "is_verified": false,
"line_number": 3266, "line_number": 3267,
"is_secret": false "is_secret": false
} }
] ]
}, },
"generated_at": "2025-07-21T21:23:30Z" "generated_at": "2025-07-22T18:12:20Z"
} }

1
app/__init__.py
View File

@@ -362,6 +362,7 @@ def init_app(application):
@application.context_processor @application.context_processor
def _attach_enums(): def _attach_enums():
from app.enums import ServicePermission from app.enums import ServicePermission
return {"ServicePermission": ServicePermission} return {"ServicePermission": ServicePermission}
@application.context_processor @application.context_processor

4
app/main/views/jobs.py
View File

@@ -222,7 +222,9 @@ def get_notifications(service_id, message_type, status_override=None): # noqa
message_type, number_of_days="seven_day" 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( return Response(
generate_notifications_csv( generate_notifications_csv(
service_id=service_id, service_id=service_id,

5
app/utils/user_permissions.py
View File

@@ -6,7 +6,10 @@ permission_mappings = {
# TODO: consider turning off email-sending permissions during SMS pilot # TODO: consider turning off email-sending permissions during SMS pilot
ServicePermission.SEND_MESSAGES: ["send_texts", ServicePermission.SEND_EMAILS], ServicePermission.SEND_MESSAGES: ["send_texts", ServicePermission.SEND_EMAILS],
ServicePermission.MANAGE_TEMPLATES: [ServicePermission.MANAGE_TEMPLATES], 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"], "manage_api_keys": ["manage_api_keys"],
ServicePermission.VIEW_ACTIVITY: [ServicePermission.VIEW_ACTIVITY], ServicePermission.VIEW_ACTIVITY: [ServicePermission.VIEW_ACTIVITY],
} }

3
tests/app/main/test_permissions.py
View File

@@ -52,7 +52,8 @@ def test_services_pages_that_org_users_are_allowed_to_see(
api_user_active["services"] = user_services api_user_active["services"] = user_services
api_user_active["organizations"] = user_organizations api_user_active["organizations"] = user_organizations
api_user_active["permissions"] = { 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( service = service_json(
name="SERVICE WITH ORG", name="SERVICE WITH ORG",

9
tests/app/main/views/test_dashboard.py
View File

@@ -924,7 +924,7 @@ def test_menu_send_messages(
ServicePermission.VIEW_ACTIVITY, ServicePermission.VIEW_ACTIVITY,
"send_texts", "send_texts",
ServicePermission.SEND_EMAILS, ServicePermission.SEND_EMAILS,
ServicePermission.MANAGE_SERVICE ServicePermission.MANAGE_SERVICE,
], ],
) )
page = str(page) page = str(page)
@@ -1004,7 +1004,12 @@ def test_menu_main_settings(
mocker, mocker,
api_user_active, api_user_active,
service_one, 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) page = str(page)
assert ( assert (

35
tests/conftest.py
View File

@@ -13,6 +13,7 @@ from dotenv import load_dotenv
from flask import Flask, url_for from flask import Flask, url_for
from app import create_app from app import create_app
from app.enums import ServicePermission
from notifications_python_client.errors import HTTPError from notifications_python_client.errors import HTTPError
from notifications_utils.url_safe_token import generate_token from notifications_utils.url_safe_token import generate_token
@@ -1018,12 +1019,12 @@ def platform_admin_user(fake_uuid):
permissions={ permissions={
SERVICE_ONE_ID: [ SERVICE_ONE_ID: [
"send_texts", "send_texts",
"send_emails", ServicePermission.SEND_EMAILS,
"manage_users", ServicePermission.MANAGE_USERS,
"manage_templates", ServicePermission.MANAGE_TEMPLATES,
"manage_settings", "manage_settings",
"manage_api_keys", "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( return create_service_one_user(
id=str(uuid4()) if with_unique_id else sample_uuid(), id=str(uuid4()) if with_unique_id else sample_uuid(),
name="Test User With Permissions", 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={ permissions={
SERVICE_ONE_ID: [ SERVICE_ONE_ID: [
"send_texts", "send_texts",
"send_emails", ServicePermission.SEND_EMAILS,
] ]
}, },
services=[SERVICE_ONE_ID], 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", name="Test User With Permissions",
permissions={ permissions={
SERVICE_ONE_ID: [ SERVICE_ONE_ID: [
"manage_templates", ServicePermission.MANAGE_TEMPLATES,
"manage_settings", "manage_settings",
"manage_users", ServicePermission.MANAGE_USERS,
"view_activity", ServicePermission.VIEW_ACTIVITY,
] ]
}, },
) )
@@ -3202,9 +3203,9 @@ def create_active_user_no_settings_permission(with_unique_id=False):
name="Test User With Permissions", name="Test User With Permissions",
permissions={ permissions={
SERVICE_ONE_ID: [ SERVICE_ONE_ID: [
"manage_templates", ServicePermission.MANAGE_TEMPLATES,
"manage_api_keys", "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", name="Test User With Permissions",
permissions={ permissions={
SERVICE_ONE_ID: [ SERVICE_ONE_ID: [
"manage_templates", ServicePermission.MANAGE_TEMPLATES,
"view_activity", ServicePermission.VIEW_ACTIVITY,
] ]
}, },
) )
@@ -3238,12 +3239,12 @@ def create_service_one_admin(**overrides):
"permissions": { "permissions": {
SERVICE_ONE_ID: [ SERVICE_ONE_ID: [
"send_texts", "send_texts",
"send_emails", ServicePermission.SEND_EMAILS,
"manage_users", ServicePermission.MANAGE_USERS,
"manage_templates", ServicePermission.MANAGE_TEMPLATES,
"manage_settings", "manage_settings",
"manage_api_keys", "manage_api_keys",
"view_activity", ServicePermission.VIEW_ACTIVITY,
] ]
}, },
} }