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

Some more conftest fixtures use create_service instead of sample_service

Browse Source
This commit is contained in:
Pea Tyczynska
2018-12-31 15:36:25 +00:00
parent a3310c2da6
commit d367daaf6e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/app/conftest.py
View File

@@ -442,7 +442,7 @@ def sample_email_job(notify_db,
service=None, service=None,
template=None): template=None):
if service is None: if service is None:
service = sample_service(notify_db, notify_db_session) service = create_service()
if template is None: if template is None:
template = sample_email_template( template = sample_email_template(
notify_db, notify_db,
@@ -550,7 +550,7 @@ def sample_notification(
if created_at is None: if created_at is None:
created_at = datetime.utcnow() created_at = datetime.utcnow()
if service is None: if service is None:
service = sample_service(notify_db, notify_db_session) service = create_service()
if template is None: if template is None:
template = sample_template(notify_db, notify_db_session, service=service) template = sample_template(notify_db, notify_db_session, service=service)
@@ -639,7 +639,7 @@ def sample_notification_with_api_key(notify_db, notify_db_session):
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def sample_email_notification(notify_db, notify_db_session): def sample_email_notification(notify_db, notify_db_session):
created_at = datetime.utcnow() created_at = datetime.utcnow()
service = sample_service(notify_db, notify_db_session) service = create_service()
template = sample_email_template(notify_db, notify_db_session, service=service) template = sample_email_template(notify_db, notify_db_session, service=service)
job = sample_job(notify_db, notify_db_session, service=service, template=template) job = sample_job(notify_db, notify_db_session, service=service, template=template)
@@ -741,7 +741,7 @@ def sample_invited_user(notify_db,
to_email_address=None): to_email_address=None):
if service is None: if service is None:
service = sample_service(notify_db, notify_db_session) service = create_service()
if to_email_address is None: if to_email_address is None:
to_email_address = 'invited_user@digital.gov.uk' to_email_address = 'invited_user@digital.gov.uk'
@@ -781,7 +781,7 @@ def sample_permission(notify_db,
'permission': permission 'permission': permission
} }
if service is None: if service is None:
service = sample_service(notify_db, notify_db_session) service = create_service()
if service: if service:
data['service'] = service data['service'] = service
p_model = Permission.query.filter_by( p_model = Permission.query.filter_by(