darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 23:41:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check if test service exists before it gets created

Browse Source
This commit is contained in:
Pea Tyczynska
2018-12-31 13:01:24 +00:00
parent c12594949f
commit 923703120b
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/app/conftest.py
View File

@@ -76,14 +76,13 @@ def service_factory(notify_db, notify_db_session):
user = create_user() user = create_user()
if not email_from: if not email_from:
email_from = service_name email_from = service_name
service = Service.query.filter_by(name=service_name).first()
if not service: service = create_service(
service = create_service( email_from=email_from,
email_from=email_from, service_name=service_name,
service_name=service_name, service_permissions=None,
service_permissions=None, user=user,
user=user, )
)
if template_type == 'email': if template_type == 'email':
create_template( create_template(
service, service,

28
tests/app/db.py
View File

@@ -83,21 +83,23 @@ def create_service(
organisation_type='central', organisation_type='central',
postage='second' postage='second'
): ):
service = Service( service = Service.query.filter_by(name=service_name).first()
name=service_name, if not service:
message_limit=message_limit, service = Service(
restricted=restricted, name=service_name,
email_from=email_from if email_from else service_name.lower().replace(' ', '.'), message_limit=message_limit,
created_by=user or create_user(email='{}@digital.cabinet-office.gov.uk'.format(uuid.uuid4())), restricted=restricted,
prefix_sms=prefix_sms, email_from=email_from if email_from else service_name.lower().replace(' ', '.'),
organisation_type=organisation_type, created_by=user or create_user(email='{}@digital.cabinet-office.gov.uk'.format(uuid.uuid4())),
postage=postage prefix_sms=prefix_sms,
) organisation_type=organisation_type,
postage=postage
)
dao_create_service(service, service.created_by, service_id, service_permissions=service_permissions) dao_create_service(service, service.created_by, service_id, service_permissions=service_permissions)
service.active = active service.active = active
service.research_mode = research_mode service.research_mode = research_mode
return service return service