diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py index 8a24502bd..da8b80b42 100644 --- a/app/dao/services_dao.py +++ b/app/dao/services_dao.py @@ -29,7 +29,6 @@ from app.models import ( TemplateRedacted, User, VerifyCode, - EDIT_FOLDERS, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, KEY_TYPE_TEST, @@ -43,7 +42,6 @@ DEFAULT_SERVICE_PERMISSIONS = [ EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, - EDIT_FOLDERS, ] diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index d17b91529..cfb2ede4f 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -50,7 +50,6 @@ from app.models import ( KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST, - EDIT_FOLDERS, EMAIL_TYPE, SMS_TYPE, INTERNATIONAL_SMS_TYPE, @@ -295,19 +294,16 @@ def test_create_service_returns_service_with_default_permissions(notify_db_sessi service = dao_fetch_service_by_id(service.id) _assert_service_permissions(service.permissions, ( - SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, EDIT_FOLDERS, + SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, )) @pytest.mark.parametrize("permission_to_remove, permissions_remaining", [ (SMS_TYPE, ( - EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, EDIT_FOLDERS, + EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, )), (EMAIL_TYPE, ( - SMS_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, EDIT_FOLDERS, - )), - (EDIT_FOLDERS, ( - EMAIL_TYPE, SMS_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, + SMS_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, )), ]) def test_remove_permission_from_service_by_id_returns_service_with_correct_permissions( @@ -348,14 +344,14 @@ def test_create_service_by_id_adding_and_removing_letter_returns_service_without service = dao_fetch_service_by_id(service.id) _assert_service_permissions(service.permissions, ( - SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, EDIT_FOLDERS, + SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, )) dao_remove_service_permission(service_id=service.id, permission=LETTER_TYPE) service = dao_fetch_service_by_id(service.id) _assert_service_permissions(service.permissions, ( - SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, EDIT_FOLDERS, + SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, )) @@ -514,7 +510,7 @@ def test_delete_service_and_associated_objects(notify_db_session): create_invited_user(service=service) assert ServicePermission.query.count() == len(( - SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, EDIT_FOLDERS, + SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, )) delete_service_and_all_associated_db_objects(service) diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index a1a0622ee..26f1750e2 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -26,7 +26,7 @@ from app.models import ( DVLA_ORG_LAND_REGISTRY, KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST, EMAIL_TYPE, SMS_TYPE, LETTER_TYPE, - EDIT_FOLDERS, INTERNATIONAL_SMS_TYPE, INBOUND_SMS_TYPE, + INTERNATIONAL_SMS_TYPE, INBOUND_SMS_TYPE, ) from tests import create_authorization_header from tests.app.conftest import ( @@ -163,7 +163,7 @@ def test_get_service_list_has_default_permissions(admin_request, service_factory set( json['permissions'] ) == set([ - EMAIL_TYPE, SMS_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE, EDIT_FOLDERS, + EMAIL_TYPE, SMS_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE, ]) for json in json_resp['data'] ) @@ -175,7 +175,7 @@ def test_get_service_by_id_has_default_service_permissions(admin_request, sample assert set( json_resp['data']['permissions'] ) == set([ - EMAIL_TYPE, SMS_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE, EDIT_FOLDERS, + EMAIL_TYPE, SMS_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE, ])