darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-14 23:08:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove domains from branding forms

Browse Source 
We’re deprecating storing the domain as text on a branding in favour of
a database relationship between branding and organisation.

We need to do this now in order to remove the validation on these fields
(which depends on the data in `domains.yml`)
This commit is contained in:
Chris Hill-Scott
2019-04-04 11:09:09 +01:00
parent 9684e962ae
commit 470b8a2912
15 changed files with 48 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/conftest.py
View File

@@ -2539,8 +2539,8 @@ def mock_get_all_email_branding(mocker):
non_standard_values = [
{'idx': 1, 'colour': 'red'},
{'idx': 2, 'colour': 'orange'},
{'idx': 3, 'text': None, 'domain': 'nhs.uk'},
{'idx': 4, 'colour': 'blue', 'domain': 'voa.gov.uk'},
{'idx': 3, 'text': None},
{'idx': 4, 'colour': 'blue'},
]
shuffle = sort_key is None
return create_email_brandings(5, non_standard_values=non_standard_values, shuffle=shuffle)
@@ -2559,19 +2559,16 @@ def mock_get_all_letter_branding(mocker):
'id': str(UUID(int=0)),
'name': 'HM Government',
'filename': 'hm-government',
'domain': None,
},
{
'id': str(UUID(int=1)),
'name': 'Land Registry',
'filename': 'land-registry',
'domain': 'landregistry.gov.uk',
},
{
'id': str(UUID(int=2)),
'name': 'Animal and Plant Health Agency',
'filename': 'animal',
'domain': None,
}
]
@@ -2587,7 +2584,6 @@ def mock_get_letter_branding_by_id(mocker):
'id': _id,
'name': 'HM Government',
'filename': 'hm-government',
'domain': 'cabinet-office.gov.uk',
}
return mocker.patch(
'app.letter_branding_client.get_letter_branding', side_effect=_get_branding_by_id
@@ -2611,7 +2607,6 @@ def create_email_branding(id, non_standard_values={}):
'text': 'Organisation text',
'id': id,
'colour': '#f00',
'domain': 'sample.com',
'brand_type': 'org',
}
@@ -2674,7 +2669,7 @@ def mock_get_email_branding_without_brand_text(mocker, fake_uuid):
@pytest.fixture(scope='function')
def mock_create_email_branding(mocker):
def _create_email_branding(logo, name, text, colour, domain, brand_type):
def _create_email_branding(logo, name, text, colour, brand_type):
return
return mocker.patch(
@@ -2684,7 +2679,7 @@ def mock_create_email_branding(mocker):
@pytest.fixture(scope='function')
def mock_update_email_branding(mocker):
def _update_email_branding(branding_id, logo, name, text, colour, domain, brand_type):
def _update_email_branding(branding_id, logo, name, text, colour, brand_type):
return
return mocker.patch(