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

Merge pull request #2241 from alphagov/add-colours-and-domain-to-email-branding

Browse Source 
New columns for email branding
This commit is contained in:
Chris Hill-Scott
2018-08-22 16:29:42 +01:00
committed by GitHub
parent 6c8345045f 473c8378fc
commit 864e732c38
9 changed files with 131 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/app/main/views/test_email_branding.py
View File

@@ -51,6 +51,9 @@ def test_edit_email_branding_shows_the_correct_branding_info(
assert page.select_one('#name').attrs.get('value') == 'Organisation name'
assert page.select_one('#text').attrs.get('value') == 'Organisation text'
assert page.select_one('#colour').attrs.get('value') == '#f00'
assert page.select_one('#banner_colour').attrs.get('value') == '#f11'
assert page.select_one('#single_id_colour').attrs.get('value') == '#f22'
assert page.select_one('#domain').attrs.get('value') == 'sample.com'
def test_create_email_branding_does_not_show_any_branding_info(
@@ -69,6 +72,9 @@ def test_create_email_branding_does_not_show_any_branding_info(
assert page.select_one('#name').attrs.get('value') == ''
assert page.select_one('#text').attrs.get('value') == ''
assert page.select_one('#colour').attrs.get('value') == ''
assert page.select_one('#banner_colour').attrs.get('value') == ''
assert page.select_one('#single_id_colour').attrs.get('value') == ''
assert page.select_one('#domain').attrs.get('value') == ''
def test_create_new_email_branding_without_logo(
@@ -82,6 +88,9 @@ def test_create_new_email_branding_without_logo(
'colour': '#ff0000',
'text': 'new text',
'name': 'new name',
'domain': 'sample.com',
'banner_colour': '#FFFF00',
'single_id_colour': '#00FF00',
}
mock_persist = mocker.patch('app.main.views.email_branding.persist_logo')
@@ -98,7 +107,10 @@ def test_create_new_email_branding_without_logo(
logo=data['logo'],
name=data['name'],
text=data['text'],
colour=data['colour']
colour=data['colour'],
banner_colour=data['banner_colour'],
single_id_colour=data['single_id_colour'],
domain=data['domain']
)
assert mock_persist.call_args_list == []
@@ -117,6 +129,9 @@ def test_create_new_email_branding_when_branding_saved(
'colour': '#ff0000',
'text': 'new text',
'name': 'new name',
'domain': 'sample.com',
'banner_colour': '#FFFF00',
'single_id_colour': '#00FF00',
}
temp_filename = LOGO_LOCATION_STRUCTURE.format(
@@ -135,7 +150,10 @@ def test_create_new_email_branding_when_branding_saved(
'colour': data['colour'],
'name': data['name'],
'text': data['text'],
'cdn_url': 'https://static-logos.cdn.com'
'cdn_url': 'https://static-logos.cdn.com',
'domain': data['domain'],
'banner_colour': data['banner_colour'],
'single_id_colour': data['single_id_colour'],
}
)
@@ -144,7 +162,10 @@ def test_create_new_email_branding_when_branding_saved(
logo=data['logo'],
name=data['name'],
text=data['text'],
colour=data['colour']
colour=data['colour'],
banner_colour=data['banner_colour'],
single_id_colour=data['single_id_colour'],
domain=data['domain']
)
@@ -195,7 +216,7 @@ def test_deletes_previous_temp_logo_after_uploading_logo(
assert mocked_delete_temp_file.call_args == call(temp_old_filename)
def test_update_exisiting_branding(
def test_update_existing_branding(
logged_in_platform_admin_client,
mocker,
fake_uuid,
@@ -209,7 +230,10 @@ def test_update_exisiting_branding(
'logo': 'test.png',
'colour': '#0000ff',
'text': 'new text',
'name': 'new name'
'name': 'new name',
'banner_colour': '#FFFF00',
'single_id_colour': '#00FF00',
'domain': 'sample.com',
}
temp_filename = LOGO_LOCATION_STRUCTURE.format(
@@ -225,7 +249,10 @@ def test_update_exisiting_branding(
url_for('.update_email_branding', logo=temp_filename, branding_id=fake_uuid),
content_type='multipart/form-data',
data={'colour': data['colour'], 'name': data['name'], 'text': data['text'],
'cdn_url': 'https://static-logos.cdn.com'}
'cdn_url': 'https://static-logos.cdn.com',
'banner_colour': data['banner_colour'], 'single_id_colour': data['single_id_colour'],
'domain': data['domain']
}
)
assert mock_update_email_branding.called
@@ -234,7 +261,10 @@ def test_update_exisiting_branding(
logo=data['logo'],
name=data['name'],
text=data['text'],
colour=data['colour']
colour=data['colour'],
banner_colour=data['banner_colour'],
single_id_colour=data['single_id_colour'],
domain=data['domain'],
)
@@ -316,7 +346,10 @@ def test_colour_regex_validation(
'logo': None,
'colour': colour_hex,
'text': 'new text',
'name': 'new name'
'name': 'new name',
'domain': 'sample.com',
'banner_colour': '#FFFF00',
'single_id_colour': '#00FF00',
}
mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')

29
tests/app/main/views/test_email_preview.py
View File

@@ -4,6 +4,8 @@ import pytest
from bs4 import BeautifulSoup
from flask import url_for
from app.main.views.index import _set_colour
@pytest.mark.parametrize(
"query_args, result", [
@@ -86,7 +88,7 @@ def test_displays_org_branding_with_banner(client, mock_get_email_branding):
assert not page.find("a", attrs={"href": "https://www.gov.uk"})
assert page.find("img", attrs={"src": re.compile("example.png")})
assert page.select("body > table > tr > td[bgcolor='#f00']") # banner colour is set
assert page.select("body > table > tr > td[bgcolor='#f11']") # banner colour is set
assert page.select("body > table table > tr > td > span")[0]\
.get_text().strip() == 'Organisation text' # brand text is set
@@ -104,5 +106,28 @@ def test_displays_org_branding_with_banner_without_brand_text(
assert not page.find("a", attrs={"href": "https://www.gov.uk"})
assert page.find("img", attrs={"src": re.compile("example.png")})
assert page.select("body > table > tr > td[bgcolor='#f00']") # banner colour is set
assert page.select("body > table > tr > td[bgcolor='#f11']") # banner colour is set
assert not page.select("body > table table > tr > td > span") == 0 # brand text is not set
@pytest.mark.parametrize('colour, banner_colour, single_id_colour, branding_type, expected_colour', [
('black', 'yellow', 'red', 'org', 'red'),
('black', 'yellow', None, 'org', 'black'),
('black', 'yellow', 'red', 'org_banner', 'yellow'),
('black', None, 'red', 'org_banner', 'black'),
('black', 'yellow', 'red', 'govuk', None),
('black', 'yellow', 'red', 'both', 'red'),
('black', 'yellow', None, 'both', 'black'),
])
def test_set_colour(colour, banner_colour, single_id_colour, branding_type, expected_colour):
email_branding = {
'logo': None,
'colour': colour,
'text': 'new text',
'name': 'new name',
'domain': 'sample.com',
'banner_colour': banner_colour,
'single_id_colour': single_id_colour,
}
colour = _set_colour(branding_type, email_branding)
assert colour == expected_colour

14
tests/app/notify_client/test_email_branding_client.py
View File

@@ -26,11 +26,15 @@ def test_get_letter_email_branding(mocker):
def test_create_email_branding(mocker):
org_data = {'logo': 'test.png', 'name': 'test name', 'text': 'test name', 'colour': 'red'}
org_data = {'logo': 'test.png', 'name': 'test name', 'text': 'test name', 'colour': 'red',
'banner_colour': 'blue', 'single_id_colour': 'yellow', 'domain': 'sample.com'}
mock_post = mocker.patch('app.notify_client.email_branding_client.EmailBrandingClient.post')
EmailBrandingClient().create_email_branding(
logo=org_data['logo'], name=org_data['name'], text=org_data['text'], colour=org_data['colour'])
logo=org_data['logo'], name=org_data['name'], text=org_data['text'], colour=org_data['colour'],
banner_colour=org_data['banner_colour'], single_id_colour=org_data['single_id_colour'],
domain=org_data['domain']
)
mock_post.assert_called_once_with(
url='/email-branding',
@@ -39,12 +43,14 @@ def test_create_email_branding(mocker):
def test_update_email_branding(mocker, fake_uuid):
org_data = {'logo': 'test.png', 'name': 'test name', 'text': 'test name', 'colour': 'red'}
org_data = {'logo': 'test.png', 'name': 'test name', 'text': 'test name', 'colour': 'red',
'banner_colour': 'blue', 'single_id_colour': 'yellow', 'domain': 'sample.com'}
mock_post = mocker.patch('app.notify_client.email_branding_client.EmailBrandingClient.post')
EmailBrandingClient().update_email_branding(
branding_id=fake_uuid, logo=org_data['logo'], name=org_data['name'], text=org_data['text'],
colour=org_data['colour'])
colour=org_data['colour'], banner_colour=org_data['banner_colour'],
single_id_colour=org_data['single_id_colour'], domain=org_data['domain'])
mock_post.assert_called_once_with(
url='/email-branding/{}'.format(fake_uuid),

13
tests/conftest.py
View File

@@ -2493,7 +2493,10 @@ def mock_get_email_branding(mocker, fake_uuid):
'name': 'Organisation name',
'text': 'Organisation text',
'id': fake_uuid,
'colour': '#f00'
'colour': '#f00',
'banner_colour': '#f11',
'single_id_colour': '#f22',
'domain': 'sample.com',
}
}
@@ -2511,7 +2514,9 @@ def mock_get_email_branding_without_brand_text(mocker, fake_uuid):
'name': 'Organisation name',
'text': '',
'id': fake_uuid,
'colour': '#f00'
'colour': '#f00',
'banner_colour': '#f11',
'single_id_colour': '#f22'
}
}
@@ -2523,7 +2528,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):
def _create_email_branding(logo, name, text, colour, banner_colour, single_id_colour, domain):
return
return mocker.patch(
@@ -2533,7 +2538,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):
def _update_email_branding(branding_id, logo, name, text, colour, banner_colour, single_id_colour, domain):
return
return mocker.patch(