darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-31 15:15:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactored code to use new service permissions only

Browse Source
This commit is contained in:
Ken Tsang
2017-06-26 14:18:04 +01:00
committed by venusbb
parent 98cd838510
commit b04d01ba27
7 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,14 +297,13 @@ def test_create_service_by_id_adding_and_removing_letter_returns_service_without
service = dao_fetch_service_by_id(service.id)
assert len(service.permissions) == 3
assert set([SMS_TYPE, EMAIL_TYPE, LETTER_TYPE]) == set(service.permissions)
assert set([SMS_TYPE, EMAIL_TYPE, LETTER_TYPE]) == set([p.permission for p in 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 set([SMS_TYPE, EMAIL_TYPE]) == set(service.permissions)
assert set([SMS_TYPE, EMAIL_TYPE]) == set([p.permission for p in service.permissions])
def test_create_service_creates_a_history_record_with_current_data(sample_user):

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

@@ -9,7 +9,8 @@ from notifications_python_client.authentication import create_jwt_token
import app
from app.dao import notifications_dao
from app.models import ApiKey, KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST, Notification, NotificationHistory
from app.models import (
ApiKey, INTERNATIONAL_SMS_TYPE, KEY_TYPE_NORMAL, KEY_TYPE_TEAM, KEY_TYPE_TEST, Notification, NotificationHistory)
from app.dao.templates_dao import dao_get_all_templates_for_service, dao_update_template
from app.dao.services_dao import dao_update_service
from app.dao.api_key_dao import save_model_api_key
@@ -1147,7 +1148,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, permissions=['international_sms'])
service = sample_service(notify_db, notify_db_session, permissions=[INTERNATIONAL_SMS_TYPE, 'sms'])
template = create_sample_template(notify_db, notify_db_session, service=service)
data = {

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

@@ -316,7 +316,8 @@ 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.permissions = ['international_sms']
result = validate_and_format_recipient('20-12-1234-1234', key_type, sample_service, 'sms')
def test_allows_api_calls_with_international_numbers_if_service_does_allow_int_sms(
key_type, notify_db, notify_db_session):
service = create_service(notify_db, notify_db_session, permissions=['sms', 'international_sms'])
result = validate_and_format_recipient('20-12-1234-1234', key_type, service, 'sms')
assert result == '201212341234'