From 18b545af51b4469f02f37213f517fc866593879d Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Thu, 9 May 2019 11:01:11 +0100 Subject: [PATCH] Remove precompiled letters permission as everyone can send precompiled now --- app/main/views/service_settings.py | 1 - .../test_service_setting_permissions.py | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 96261a3ff..8a02206e0 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -62,7 +62,6 @@ from app.utils import ( PLATFORM_ADMIN_SERVICE_PERMISSIONS = OrderedDict([ ('inbound_sms', {'title': 'Receive inbound SMS', 'requires': 'sms', 'endpoint': '.service_set_inbound_number'}), - ('precompiled_letter', {'title': 'Send precompiled letters', 'requires': 'letter'}), ('email_auth', {'title': 'User auth type editing'}), ('upload_document', {'title': 'Uploading documents', 'endpoint': '.service_switch_can_upload_document'}), ('edit_folder_permissions', {'title': 'Folder permissions'}), diff --git a/tests/app/main/views/service_settings/test_service_setting_permissions.py b/tests/app/main/views/service_settings/test_service_setting_permissions.py index ff3f327e9..270a42945 100644 --- a/tests/app/main/views/service_settings/test_service_setting_permissions.py +++ b/tests/app/main/views/service_settings/test_service_setting_permissions.py @@ -40,8 +40,6 @@ def test_service_set_permission_requires_platform_admin( @pytest.mark.parametrize('permission, form_data, on', [ ('upload_document', 'True', True), ('upload_document', 'False', False), - ('precompiled_letter', 'True', True), - ('precompiled_letter', 'False', False), ('inbound_sms', 'True', True), ('inbound_sms', 'False', False), ('email_auth', 'True', True), @@ -73,12 +71,6 @@ def test_service_set_permission( @pytest.mark.parametrize('service_fields, endpoint, kwargs, text', [ ({'restricted': True}, '.service_switch_live', {}, 'Live Off Change'), ({'restricted': False}, '.service_switch_live', {}, 'Live On Change'), - - ({'permissions': ['letter', 'precompiled_letter']}, - '.service_set_permission', {'permission': 'precompiled_letter'}, 'Send precompiled letters On Change'), - ({'permissions': ['letter']}, - '.service_set_permission', {'permission': 'precompiled_letter'}, 'Send precompiled letters Off Change'), - ({'permissions': ['upload_document']}, '.service_switch_can_upload_document', {}, 'Uploading documents On Change'), ({'permissions': []}, @@ -120,11 +112,8 @@ def test_service_setting_button_toggles( @pytest.mark.parametrize('permissions,permissions_text,visible', [ ('sms', 'inbound SMS', True), ('inbound_sms', 'inbound SMS', False), # no sms parent permission - ('letter', 'precompiled letters', True), - ('precompiled_letter', 'precompiled letters', False), # no letter parent permission # also test no permissions set ('', 'inbound SMS', False), - ('', 'precompiled letters', False) ]) def test_service_settings_doesnt_show_option_if_parent_permission_disabled( get_service_settings_page,