From dcf788536523aef80a313afe6609a197d15549b9 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Fri, 9 Feb 2024 11:42:53 -0500 Subject: [PATCH] Only 6 fails left to go. Signed-off-by: Cliff Hill --- app/service/statistics.py | 2 +- tests/app/service/test_rest.py | 8 ++++---- tests/app/service/test_service_data_retention_rest.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/service/statistics.py b/app/service/statistics.py index e781854bd..bf230f164 100644 --- a/app/service/statistics.py +++ b/app/service/statistics.py @@ -40,7 +40,7 @@ def format_admin_stats(statistics): def create_stats_dict(): stats_dict = {} - for template in TemplateType: + for template in (TemplateType.SMS, TemplateType.EMAIL): stats_dict[template] = {} for status in ("total", "test-key"): diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 189cc2f4b..d344e6aae 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -18,6 +18,7 @@ from app.enums import ( KeyType, NotificationType, OrganizationType, + PermissionType, ServicePermissionType, TemplateType, ) @@ -922,9 +923,9 @@ def test_update_permissions_will_override_permission_flags( result = resp.json assert resp.status_code == 200 - assert set(result["data"]["permissions"]) == [ + assert set(result["data"]["permissions"]) == { ServicePermissionType.INTERNATIONAL_SMS - ] + } def test_update_service_permissions_will_add_service_permissions( @@ -1210,9 +1211,8 @@ def test_default_permissions_are_added_for_user_service( service_permissions = json_resp["data"]["permissions"][ str(sample_service.id) ] - from app.dao.permissions_dao import default_service_permissions - assert sorted(ServicePermissionType.defaults()) == sorted( + assert sorted(i.value for i in PermissionType.defaults()) == sorted( service_permissions ) diff --git a/tests/app/service/test_service_data_retention_rest.py b/tests/app/service/test_service_data_retention_rest.py index f651c253a..4defec5c0 100644 --- a/tests/app/service/test_service_data_retention_rest.py +++ b/tests/app/service/test_service_data_retention_rest.py @@ -23,8 +23,8 @@ def test_get_service_data_retention(client, sample_service): assert response.status_code == 200 json_response = json.loads(response.get_data(as_text=True)) assert len(json_response) == 2 - assert json_response[0] == email_data_retention.serialize() - assert json_response[1] == sms_data_retention.serialize() + assert json_response[0] == sms_data_retention.serialize() + assert json_response[1] == email_data_retention.serialize() def test_get_service_data_retention_returns_empty_list(client, sample_service):