From 95115e7ae6ae3eefcb49196e015e728ee3e02409 Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Mon, 31 Dec 2018 14:34:02 +0000 Subject: [PATCH] Use create_service instead of sample_service when creating service permission for tests --- tests/app/conftest.py | 2 +- tests/app/db.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/app/conftest.py b/tests/app/conftest.py index e77deb4a1..ff817501e 100644 --- a/tests/app/conftest.py +++ b/tests/app/conftest.py @@ -802,7 +802,7 @@ def sample_user_service_permission( if user is None: user = create_user() if service is None: - service = sample_service(notify_db, notify_db_session, user=user) + service = create_service(user=user) data = { 'user': user, 'service': service, diff --git a/tests/app/db.py b/tests/app/db.py index e0ca9bddd..ee17c48cd 100644 --- a/tests/app/db.py +++ b/tests/app/db.py @@ -17,7 +17,7 @@ from app.dao.service_data_retention_dao import insert_service_data_retention from app.dao.service_inbound_api_dao import save_service_inbound_api from app.dao.service_permissions_dao import dao_add_service_permission from app.dao.service_sms_sender_dao import update_existing_sms_sender_with_inbound_number, dao_update_service_sms_sender -from app.dao.services_dao import dao_create_service +from app.dao.services_dao import dao_create_service, dao_add_user_to_service from app.dao.templates_dao import dao_create_template, dao_update_template from app.dao.users_dao import save_model_user from app.models import ( @@ -99,6 +99,9 @@ def create_service( service.active = active service.research_mode = research_mode + else: + if user not in service.users: + dao_add_user_to_service(service, user) return service