mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-01 07:35:34 -05:00
Add international letters as a default permission when creating a new service
This commit is contained in:
@@ -42,7 +42,7 @@ from app.models import (EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, KEY_TYPE_NORMAL,
|
||||
NotificationHistory, Organisation, Permission, Service,
|
||||
ServicePermission, ServiceUser, Template,
|
||||
TemplateHistory, User, VerifyCode,
|
||||
user_folder_permissions)
|
||||
user_folder_permissions, INTERNATIONAL_LETTERS)
|
||||
from tests.app.db import (create_annual_billing, create_api_key,
|
||||
create_email_branding, create_ft_billing,
|
||||
create_inbound_number, create_invited_user,
|
||||
@@ -484,16 +484,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, UPLOAD_LETTERS
|
||||
SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_LETTERS, INTERNATIONAL_LETTERS
|
||||
))
|
||||
|
||||
|
||||
@pytest.mark.parametrize("permission_to_remove, permissions_remaining", [
|
||||
(SMS_TYPE, (
|
||||
EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_LETTERS,
|
||||
EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_LETTERS, INTERNATIONAL_LETTERS
|
||||
)),
|
||||
(EMAIL_TYPE, (
|
||||
SMS_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_LETTERS,
|
||||
SMS_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_LETTERS, INTERNATIONAL_LETTERS
|
||||
)),
|
||||
])
|
||||
def test_remove_permission_from_service_by_id_returns_service_with_correct_permissions(
|
||||
@@ -525,14 +525,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, UPLOAD_LETTERS,
|
||||
SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_LETTERS, INTERNATIONAL_LETTERS
|
||||
))
|
||||
|
||||
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, UPLOAD_LETTERS,
|
||||
SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_LETTERS, INTERNATIONAL_LETTERS
|
||||
))
|
||||
|
||||
|
||||
@@ -669,7 +669,7 @@ def test_delete_service_and_associated_objects(notify_db_session):
|
||||
user.organisations = [organisation]
|
||||
|
||||
assert ServicePermission.query.count() == len((
|
||||
SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_LETTERS,
|
||||
SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_LETTERS, INTERNATIONAL_LETTERS
|
||||
))
|
||||
|
||||
delete_service_and_all_associated_db_objects(service)
|
||||
|
||||
Reference in New Issue
Block a user