Add service permissions DAO and refactor user service permission mock

This commit is contained in:
Ken Tsang
2017-05-11 15:22:58 +01:00
parent 54cedf39e7
commit 114d4d84d4
9 changed files with 165 additions and 23 deletions

View File

@@ -15,7 +15,7 @@ from tests import create_authorization_header
from tests.app.db import create_template
from tests.app.conftest import (
sample_service as create_service,
sample_service_permission as create_service_permission,
sample_user_service_permission as create_user_service_permission,
sample_notification as create_sample_notification,
sample_notification_history as create_notification_history,
sample_notification_with_job
@@ -941,12 +941,12 @@ def test_add_unknown_user_to_service_returns404(notify_api, notify_db, notify_db
assert result['message'] == expected_message
def test_remove_user_from_service(notify_api, notify_db, notify_db_session, sample_service_permission):
def test_remove_user_from_service(notify_api, notify_db, notify_db_session, sample_user_service_permission):
with notify_api.test_request_context():
with notify_api.test_client() as client:
second_user = create_user(email="new@digital.cabinet-office.gov.uk")
# Simulates successfully adding a user to the service
second_permission = create_service_permission(
second_permission = create_user_service_permission(
notify_db,
notify_db_session,
user=second_user)
@@ -961,13 +961,13 @@ def test_remove_user_from_service(notify_api, notify_db, notify_db_session, samp
assert resp.status_code == 204
def test_remove_user_from_service(notify_api, notify_db, notify_db_session, sample_service_permission):
def test_remove_user_from_service(notify_api, notify_db, notify_db_session, sample_user_service_permission):
with notify_api.test_request_context():
with notify_api.test_client() as client:
second_user = create_user(email="new@digital.cabinet-office.gov.uk")
endpoint = url_for(
'service.remove_user_from_service',
service_id=str(sample_service_permission.service.id),
service_id=str(sample_user_service_permission.service.id),
user_id=str(second_user.id))
auth_header = create_authorization_header()
resp = client.delete(
@@ -979,13 +979,13 @@ def test_remove_user_from_service(notify_api, notify_db, notify_db_session, samp
def test_cannot_remove_only_user_from_service(notify_api,
notify_db,
notify_db_session,
sample_service_permission):
sample_user_service_permission):
with notify_api.test_request_context():
with notify_api.test_client() as client:
endpoint = url_for(
'service.remove_user_from_service',
service_id=str(sample_service_permission.service.id),
user_id=str(sample_service_permission.user.id))
service_id=str(sample_user_service_permission.service.id),
user_id=str(sample_user_service_permission.user.id))
auth_header = create_authorization_header()
resp = client.delete(
endpoint,