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

ken-use-only-new-service-permissions

Browse Source
This commit is contained in:
Ken Tsang
2017-06-23 17:06:09 +01:00
committed by venusbb
parent 42a061cb7b
commit 98cd838510
11 changed files with 16 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/conftest.py
View File

@@ -127,7 +127,6 @@ def sample_service(
restricted=False,
limit=1000,
email_from=None,
can_send_international_sms=False,
permissions=[SMS_TYPE, EMAIL_TYPE]
):
if user is None:
@@ -141,7 +140,6 @@ def sample_service(
'email_from': email_from,
'created_by': user,
'letter_contact_block': 'London,\nSW1A 1AA',
'can_send_international_sms': can_send_international_sms
}
service = Service.query.filter_by(name=service_name).first()
if not service:

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

@@ -262,55 +262,6 @@ def test_create_service_returns_service_with_default_permissions(service_factory
assert set([SMS_TYPE, EMAIL_TYPE]) == set(p.permission for p in service.permissions)
# This test is only for backward compatibility and will be removed
# when the deprecated 'can_use' columns are not used in the Service data model
@pytest.mark.parametrize("permission_to_add, can_send_letters, can_send_international_sms",
[(LETTER_TYPE, True, False),
(INTERNATIONAL_SMS_TYPE, False, True)])
def test_create_service_by_id_adding_service_permission_returns_service_with_flags_and_permissions_set(
service_factory, permission_to_add, can_send_letters, can_send_international_sms):
service = service_factory.get('testing', email_from='testing')
dao_add_service_permission(service_id=service.id, permission=permission_to_add)
service.set_permissions()
service = dao_fetch_service_by_id(service.id)
assert len(service.permissions) == 3
assert set([SMS_TYPE, EMAIL_TYPE, permission_to_add]) == set(p.permission for p in service.permissions)
assert service.can_send_letters == can_send_letters
assert service.can_send_international_sms == can_send_international_sms
# This test is only for backward compatibility and will be removed
# when the deprecated 'can_use' columns are not used in the Service data model
@pytest.mark.parametrize("permission_to_remove, can_send_letters, can_send_international_sms",
[(LETTER_TYPE, False, True),
(INTERNATIONAL_SMS_TYPE, True, False)])
def test_create_service_by_id_removing_service_permission_returns_service_with_flags_and_permissions_set(
service_factory, permission_to_remove, can_send_letters, can_send_international_sms):
service = service_factory.get('testing', email_from='testing')
dao_add_service_permission(service_id=service.id, permission=LETTER_TYPE)
dao_add_service_permission(service_id=service.id, permission=INTERNATIONAL_SMS_TYPE)
service = dao_fetch_service_by_id(service.id)
service.set_permissions()
assert len(service.permissions) == 4
assert service.can_send_letters
assert service.can_send_international_sms
dao_remove_service_permission(service_id=service.id, permission=permission_to_remove)
service.set_permissions()
service = dao_fetch_service_by_id(service.id)
expected_permissions = [SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE]
expected_permissions.remove(permission_to_remove)
assert len(service.permissions) == 3
assert set(expected_permissions) == set(p.permission for p in service.permissions)
assert service.can_send_letters == can_send_letters
assert service.can_send_international_sms == can_send_international_sms
@pytest.mark.parametrize("permission_to_remove, permission_remaining",
[(SMS_TYPE, EMAIL_TYPE),
(EMAIL_TYPE, SMS_TYPE)])
@@ -343,20 +294,17 @@ def test_create_service_by_id_adding_and_removing_letter_returns_service_without
service = service_factory.get('testing', email_from='testing')
dao_add_service_permission(service_id=service.id, permission=LETTER_TYPE)
service.set_permissions()
service = dao_fetch_service_by_id(service.id)
assert len(service.permissions) == 3
assert all(p.permission in [SMS_TYPE, EMAIL_TYPE, LETTER_TYPE] for p in service.permissions)
assert service.can_send_letters
assert set([SMS_TYPE, EMAIL_TYPE, LETTER_TYPE]) == set(service.permissions)
dao_remove_service_permission(service_id=service.id, permission=LETTER_TYPE)
service.set_permissions()
service = dao_fetch_service_by_id(service.id)
assert len(service.permissions) == 2
assert all(p.permission in [SMS_TYPE, EMAIL_TYPE] for p in service.permissions)
assert not service.can_send_letters
assert set([SMS_TYPE, EMAIL_TYPE]) == set(service.permissions)
def test_create_service_creates_a_history_record_with_current_data(sample_user):

2
tests/app/notifications/rest/test_send_notification.py
View File

@@ -1147,7 +1147,7 @@ def test_should_not_allow_international_number_on_sms_notification(client, sampl
def test_should_allow_international_number_on_sms_notification(client, notify_db, notify_db_session, mocker):
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
service = sample_service(notify_db, notify_db_session, can_send_international_sms=True)
service = sample_service(notify_db, notify_db_session, permissions=['international_sms'])
template = create_sample_template(notify_db, notify_db_session, service=service)
data = {

2
tests/app/notifications/test_validators.py
View File

@@ -317,6 +317,6 @@ def test_rejects_api_calls_with_international_numbers_if_service_does_not_allow_
@pytest.mark.parametrize('key_type', ['test', 'normal'])
def test_allows_api_calls_with_international_numbers_if_service_does_allow_int_sms(sample_service, key_type):
sample_service.can_send_international_sms = True
sample_service.permissions = ['international_sms']
result = validate_and_format_recipient('20-12-1234-1234', key_type, sample_service, 'sms')
assert result == '201212341234'

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

@@ -284,8 +284,6 @@ def test_create_service(client, sample_user):
json_resp = json.loads(resp.get_data(as_text=True))
assert json_resp['data']['name'] == 'created service'
assert not json_resp['data']['research_mode']
assert not json_resp['data']['can_send_letters']
assert not json_resp['data']['can_send_international_sms']
def test_should_not_create_service_with_missing_user_id_field(notify_api, fake_uuid):
@@ -478,13 +476,10 @@ def test_update_service_flags(client, sample_service):
assert resp.status_code == 200
assert json_resp['data']['name'] == sample_service.name
assert json_resp['data']['research_mode'] is False
assert json_resp['data']['can_send_letters'] is False
assert json_resp['data']['can_send_international_sms'] is False
data = {
'research_mode': True,
'can_send_letters': True,
'can_send_international_sms': True,
'permissions': ['letter', 'international_sms']
}
auth_header = create_authorization_header()
@@ -497,8 +492,7 @@ def test_update_service_flags(client, sample_service):
result = json.loads(resp.get_data(as_text=True))
assert resp.status_code == 200
assert result['data']['research_mode'] is True
assert result['data']['can_send_letters'] is True
assert result['data']['can_send_international_sms'] is True
assert set(result['data']['permissions']) == set(['letter', 'international_sms'])
@pytest.fixture(scope='function')
@@ -509,8 +503,7 @@ def service_with_no_permissions(notify_db, notify_db_session):
def test_update_service_flags_with_service_without_default_service_permissions(client, service_with_no_permissions):
auth_header = create_authorization_header()
data = {
'can_send_letters': True,
'can_send_international_sms': True,
'permissions': ['letter', 'international_sms'],
}
resp = client.post(
@@ -521,8 +514,6 @@ def test_update_service_flags_with_service_without_default_service_permissions(c
result = json.loads(resp.get_data(as_text=True))
assert resp.status_code == 200
assert result['data']['can_send_letters'] is True
assert result['data']['can_send_international_sms'] is True
assert set(result['data']['permissions']) == set([LETTER_TYPE, INTERNATIONAL_SMS_TYPE])
@@ -532,10 +523,10 @@ def test_update_service_flags_will_remove_service_permissions(client, notify_db,
service = create_service(
notify_db, notify_db_session, permissions=[SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE])
assert service.can_send_international_sms is True
assert INTERNATIONAL_SMS_TYPE in service.permissions
data = {
'can_send_international_sms': False
'permissions': [SMS_TYPE, EMAIL_TYPE]
}
resp = client.post(
@@ -546,7 +537,7 @@ def test_update_service_flags_will_remove_service_permissions(client, notify_db,
result = json.loads(resp.get_data(as_text=True))
assert resp.status_code == 200
assert result['data']['can_send_international_sms'] is False
assert 'international_sms' not in result['data']['permissions']
permissions = ServicePermission.query.filter_by(service_id=service.id).all()
assert set([p.permission for p in permissions]) == set([SMS_TYPE, EMAIL_TYPE])
@@ -567,8 +558,6 @@ def test_update_permissions_will_override_permission_flags(client, service_with_
result = json.loads(resp.get_data(as_text=True))
assert resp.status_code == 200
assert result['data']['can_send_letters'] is True
assert result['data']['can_send_international_sms'] is True
assert set(result['data']['permissions']) == set([LETTER_TYPE, INTERNATIONAL_SMS_TYPE])

2
tests/app/v2/notifications/test_post_notifications.py
View File

@@ -307,7 +307,7 @@ def test_post_sms_notification_returns_400_if_not_allowed_to_send_int_sms(client
def test_post_sms_notification_returns_201_if_allowed_to_send_int_sms(notify_db, notify_db_session, client, mocker):
service = sample_service(notify_db, notify_db_session, can_send_international_sms=True)
service = sample_service(notify_db, notify_db_session, permissions=["international_sms"])
template = create_sample_template(notify_db, notify_db_session, service=service)
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')