darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-09 10:59:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update service permissions to ensure state in sync

Browse Source
This commit is contained in:
Ken Tsang
2017-05-23 13:42:46 +01:00
parent 253614cd19
commit 67246f2da5
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/schemas.py
View File

@@ -25,11 +25,7 @@ from notifications_utils.recipients import (
from app import ma from app import ma
from app import models from app import models
<<<<<<< HEAD
from app.models import ServicePermission, INTERNATIONAL_SMS_TYPE, SMS_TYPE, LETTER_TYPE, EMAIL_TYPE from app.models import ServicePermission, INTERNATIONAL_SMS_TYPE, SMS_TYPE, LETTER_TYPE, EMAIL_TYPE
=======
from app.models import ServicePermission
>>>>>>> Updated service DAO and API end points
from app.dao.permissions_dao import permission_dao from app.dao.permissions_dao import permission_dao
from app.dao.service_permissions_dao import dao_fetch_service_permissions from app.dao.service_permissions_dao import dao_fetch_service_permissions
from app.utils import get_template_instance from app.utils import get_template_instance

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

@@ -159,7 +159,7 @@ def test_get_service_list_has_default_permissions(client, service_factory):
assert response.status_code == 200 assert response.status_code == 200
json_resp = json.loads(response.get_data(as_text=True)) json_resp = json.loads(response.get_data(as_text=True))
assert len(json_resp['data']) == 3 assert len(json_resp['data']) == 3
assert all([set(json['permissions']) & set([EMAIL_TYPE, SMS_TYPE]) for json in json_resp['data']]) assert all([set(json['permissions']) == set([EMAIL_TYPE, SMS_TYPE]) for json in json_resp['data']])
def test_get_service_by_id_has_default_service_permissions(client, sample_service): def test_get_service_by_id_has_default_service_permissions(client, sample_service):