darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-25 16:53:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2357 from alphagov/remove-edit-folder-permission

Browse Source 
Remove the need for the edit_folders service permission.
This commit is contained in:
Rebecca Law
2019-02-15 13:19:48 +00:00
committed by GitHub
parent 26ea503fc8 38a599c758
commit 331414d379
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/services_dao.py
View File

@@ -29,7 +29,6 @@ from app.models import (
TemplateRedacted, TemplateRedacted,
User, User,
VerifyCode, VerifyCode,
EDIT_FOLDERS,
EMAIL_TYPE, EMAIL_TYPE,
INTERNATIONAL_SMS_TYPE, INTERNATIONAL_SMS_TYPE,
KEY_TYPE_TEST, KEY_TYPE_TEST,
@@ -43,7 +42,6 @@ DEFAULT_SERVICE_PERMISSIONS = [
EMAIL_TYPE, EMAIL_TYPE,
LETTER_TYPE, LETTER_TYPE,
INTERNATIONAL_SMS_TYPE, INTERNATIONAL_SMS_TYPE,
EDIT_FOLDERS,
] ]

16
tests/app/dao/test_services_dao.py
View File

@@ -48,7 +48,6 @@ from app.models import (
KEY_TYPE_NORMAL, KEY_TYPE_NORMAL,
KEY_TYPE_TEAM, KEY_TYPE_TEAM,
KEY_TYPE_TEST, KEY_TYPE_TEST,
EDIT_FOLDERS,
EMAIL_TYPE, EMAIL_TYPE,
SMS_TYPE, SMS_TYPE,
INTERNATIONAL_SMS_TYPE, INTERNATIONAL_SMS_TYPE,
@@ -290,19 +289,16 @@ def test_create_service_returns_service_with_default_permissions(notify_db_sessi
service = dao_fetch_service_by_id(service.id) service = dao_fetch_service_by_id(service.id)
_assert_service_permissions(service.permissions, ( _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", [ @pytest.mark.parametrize("permission_to_remove, permissions_remaining", [
(SMS_TYPE, ( (SMS_TYPE, (
EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, EDIT_FOLDERS, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE,
)), )),
(EMAIL_TYPE, ( (EMAIL_TYPE, (
SMS_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, EDIT_FOLDERS, SMS_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE,
)),
(EDIT_FOLDERS, (
EMAIL_TYPE, SMS_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE,
)), )),
]) ])
def test_remove_permission_from_service_by_id_returns_service_with_correct_permissions( def test_remove_permission_from_service_by_id_returns_service_with_correct_permissions(
@@ -334,14 +330,14 @@ def test_create_service_by_id_adding_and_removing_letter_returns_service_without
service = dao_fetch_service_by_id(service.id) service = dao_fetch_service_by_id(service.id)
_assert_service_permissions(service.permissions, ( _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) dao_remove_service_permission(service_id=service.id, permission=LETTER_TYPE)
service = dao_fetch_service_by_id(service.id) service = dao_fetch_service_by_id(service.id)
_assert_service_permissions(service.permissions, ( _assert_service_permissions(service.permissions, (
SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, EDIT_FOLDERS, SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE,
)) ))
@@ -474,7 +470,7 @@ def test_delete_service_and_associated_objects(notify_db_session):
create_invited_user(service=service) create_invited_user(service=service)
assert ServicePermission.query.count() == len(( 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) delete_service_and_all_associated_db_objects(service)

6
tests/app/service/test_rest.py
View File

@@ -25,7 +25,7 @@ from app.models import (
User, User,
KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST, KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST,
EMAIL_TYPE, SMS_TYPE, LETTER_TYPE, 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 import create_authorization_header
from tests.app.conftest import ( from tests.app.conftest import (
@@ -160,7 +160,7 @@ def test_get_service_list_has_default_permissions(admin_request, service_factory
set( set(
json['permissions'] json['permissions']
) == set([ ) == 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'] for json in json_resp['data']
) )
@@ -172,7 +172,7 @@ def test_get_service_by_id_has_default_service_permissions(admin_request, sample
assert set( assert set(
json_resp['data']['permissions'] json_resp['data']['permissions']
) == set([ ) == set([
EMAIL_TYPE, SMS_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE, EDIT_FOLDERS, EMAIL_TYPE, SMS_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE,
]) ])