darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-09 17:19:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor creating nhs branding in tests into a fixture

Browse Source
This commit is contained in:
Pea Tyczynska
2022-04-19 12:25:11 +01:00
parent 769b71cdc0
commit 124562b50a
2 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/app/conftest.py
View File

@@ -53,6 +53,7 @@ from app.models import (
from tests import create_admin_authorization_header from tests import create_admin_authorization_header
from tests.app.db import ( from tests.app.db import (
create_api_key, create_api_key,
create_email_branding,
create_inbound_number, create_inbound_number,
create_invited_org_user, create_invited_org_user,
create_job, create_job,
@@ -919,6 +920,19 @@ def broadcast_organisation(notify_db_session):
return org return org
@pytest.fixture
def nhs_email_branding(notify_db_session):
# we wipe email_branding table in test db between the tests, so we have to recreate this branding
# that is normally present on all environments and applied through migration
nhs_email_branding_id = current_app.config['NHS_EMAIL_BRANDING_ID']
return create_email_branding(
id=nhs_email_branding_id,
logo='1ac6f483-3105-4c9e-9017-dd7fb2752c44-nhs-blue_x2.png',
name='NHS'
)
@pytest.fixture @pytest.fixture
def restore_provider_details(notify_db, notify_db_session): def restore_provider_details(notify_db, notify_db_session):
""" """

35
tests/app/organisation/test_rest.py
View File

@@ -192,17 +192,8 @@ def test_post_create_organisation(admin_request, notify_db_session, crown):
@pytest.mark.parametrize('org_type', ["nhs_central", "nhs_local", "nhs_gp"]) @pytest.mark.parametrize('org_type', ["nhs_central", "nhs_local", "nhs_gp"])
def test_post_create_organisation_sets_default_nhs_branding_for_nhs_orgs( def test_post_create_organisation_sets_default_nhs_branding_for_nhs_orgs(
admin_request, notify_db_session, org_type admin_request, notify_db_session, nhs_email_branding, org_type
): ):
# we wipe email_branding table in test db between the tests, so we have to recreate this branding
# that is normally present on all environments and applied through migration
nhs_email_branding_id = current_app.config['NHS_EMAIL_BRANDING_ID']
create_email_branding(
id=nhs_email_branding_id,
logo='1ac6f483-3105-4c9e-9017-dd7fb2752c44-nhs-blue_x2.png',
name='NHS'
)
data = { data = {
'name': 'test organisation', 'name': 'test organisation',
'active': True, 'active': True,
@@ -219,7 +210,7 @@ def test_post_create_organisation_sets_default_nhs_branding_for_nhs_orgs(
organisations = Organisation.query.all() organisations = Organisation.query.all()
assert len(organisations) == 1 assert len(organisations) == 1
assert organisations[0].email_branding_id == uuid.UUID(nhs_email_branding_id) assert organisations[0].email_branding_id == uuid.UUID(current_app.config['NHS_EMAIL_BRANDING_ID'])
def test_post_create_organisation_existing_name_raises_400(admin_request, sample_organisation): def test_post_create_organisation_existing_name_raises_400(admin_request, sample_organisation):
@@ -382,18 +373,10 @@ def test_update_other_organisation_attributes_doesnt_clear_domains(
@pytest.mark.parametrize('new_org_type', ["nhs_central", "nhs_local", "nhs_gp"]) @pytest.mark.parametrize('new_org_type', ["nhs_central", "nhs_local", "nhs_gp"])
def test_post_update_organisation_to_nhs_type_updates_branding_if_none_present( def test_post_update_organisation_to_nhs_type_updates_branding_if_none_present(
admin_request, admin_request,
nhs_email_branding,
notify_db_session, notify_db_session,
new_org_type new_org_type
): ):
# we wipe email_branding table in test db between the tests, so we have to recreate this branding
# that is normally present on all environments and applied through migration
nhs_email_branding_id = current_app.config['NHS_EMAIL_BRANDING_ID']
create_email_branding(
id=nhs_email_branding_id,
logo='1ac6f483-3105-4c9e-9017-dd7fb2752c44-nhs-blue_x2.png',
name='NHS'
)
org = create_organisation(organisation_type='central') org = create_organisation(organisation_type='central')
data = { data = {
'organisation_type': new_org_type, 'organisation_type': new_org_type,
@@ -411,24 +394,16 @@ def test_post_update_organisation_to_nhs_type_updates_branding_if_none_present(
assert len(organisation) == 1 assert len(organisation) == 1
assert organisation[0].id == org.id assert organisation[0].id == org.id
assert organisation[0].organisation_type == new_org_type assert organisation[0].organisation_type == new_org_type
assert organisation[0].email_branding_id == uuid.UUID(nhs_email_branding_id) assert organisation[0].email_branding_id == uuid.UUID(current_app.config['NHS_EMAIL_BRANDING_ID'])
@pytest.mark.parametrize('new_org_type', ["nhs_central", "nhs_local", "nhs_gp"]) @pytest.mark.parametrize('new_org_type', ["nhs_central", "nhs_local", "nhs_gp"])
def test_post_update_organisation_to_nhs_type_does_not_update_branding_if_default_branding_set( def test_post_update_organisation_to_nhs_type_does_not_update_branding_if_default_branding_set(
admin_request, admin_request,
nhs_email_branding,
notify_db_session, notify_db_session,
new_org_type new_org_type
): ):
# we wipe email_branding table in test db between the tests, so we have to recreate this branding
# that is normally present on all environment and applied through migration
nhs_email_branding_id = current_app.config['NHS_EMAIL_BRANDING_ID']
create_email_branding(
id=nhs_email_branding_id,
logo='1ac6f483-3105-4c9e-9017-dd7fb2752c44-nhs-blue_x2.png',
name='NHS'
)
current_branding = create_email_branding( current_branding = create_email_branding(
logo='example.png', logo='example.png',
name='custom branding' name='custom branding'