darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 09:51:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove some use of calling fixtures directly

Browse Source 
also experiment with giving the fixtures a different name, so we can be
sure that they won't be called in functions. Open to change on this.
This commit is contained in:
Leo Hemsted
2018-10-17 16:12:57 +01:00
parent c63b147a2d
commit 3589f1dd63
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/app/conftest.py
View File

@@ -189,24 +189,22 @@ def sample_service(
return service return service
@pytest.fixture(scope='function') @pytest.fixture(scope='function', name='sample_service_full_permissions')
def sample_service_full_permissions(notify_db, notify_db_session): def _sample_service_full_permissions(notify_db_session):
return sample_service( service = create_service(
notify_db,
notify_db_session,
# ensure name doesn't clash with regular sample service
service_name="sample service full permissions", service_name="sample service full permissions",
permissions=set(SERVICE_PERMISSION_TYPES) service_permissions=set(SERVICE_PERMISSION_TYPES)
) )
create_inbound_number('12345', service_id=service.id)
@pytest.fixture(scope='function')
def sample_service_custom_letter_contact_block(notify_db, notify_db_session):
service = sample_service(notify_db, notify_db_session)
create_letter_contact(service, contact_block='((contact block))')
return service return service
@pytest.fixture(scope='function', name='sample_service_custom_letter_contact_block')
def _sample_service_custom_letter_contact_block(sample_service):
create_letter_contact(sample_service, contact_block='((contact block))')
return sample_service
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def sample_template( def sample_template(
notify_db, notify_db,
@@ -226,7 +224,9 @@ def sample_template(
if user is None: if user is None:
user = create_user() user = create_user()
if service is None: if service is None:
service = sample_service(notify_db, notify_db_session, permissions=permissions) service = Service.query.filter_by(name='Sample service').first()
if not service:
service = create_service(service_permissions=permissions)
if created_by is None: if created_by is None:
created_by = create_user() created_by = create_user()