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

Merge pull request #1269 from alphagov/fix-sending-emails-no-logo

Browse Source 
Fix sending emails with no logo
This commit is contained in:
Chris Hill-Scott
2017-09-21 13:40:11 +01:00
committed by GitHub
parent 8360b9a122 ee5888f07f
commit e6d6b6f985
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/delivery/send_to_providers.py
View File

@@ -179,10 +179,11 @@ def get_html_email_options(service):
govuk_banner = service.branding not in (BRANDING_ORG, BRANDING_ORG_BANNER) govuk_banner = service.branding not in (BRANDING_ORG, BRANDING_ORG_BANNER)
brand_banner = service.branding == BRANDING_ORG_BANNER brand_banner = service.branding == BRANDING_ORG_BANNER
if service.organisation and service.branding != BRANDING_GOVUK: if service.organisation and service.branding != BRANDING_GOVUK:
logo_url = get_logo_url( logo_url = get_logo_url(
current_app.config['ADMIN_BASE_URL'], current_app.config['ADMIN_BASE_URL'],
service.organisation.logo service.organisation.logo
) ) if service.organisation.logo else None
branding = { branding = {
'brand_colour': service.organisation.colour, 'brand_colour': service.organisation.colour,

12
tests/app/delivery/test_send_to_providers.py
View File

@@ -459,6 +459,18 @@ def test_get_html_email_renderer_prepends_logo_path(notify_api):
assert renderer['brand_logo'] == 'http://static-logos.notify.tools/justice-league.png' assert renderer['brand_logo'] == 'http://static-logos.notify.tools/justice-league.png'
def test_get_html_email_renderer_handles_org_without_logo(notify_api):
Service = namedtuple('Service', ['branding', 'organisation'])
Organisation = namedtuple('Organisation', ['colour', 'name', 'logo'])
org = Organisation(colour='#000000', logo=None, name='Justice League')
service = Service(branding=BRANDING_ORG, organisation=org)
renderer = send_to_providers.get_html_email_options(service)
assert renderer['brand_logo'] is None
@pytest.mark.parametrize('base_url, expected_url', [ @pytest.mark.parametrize('base_url, expected_url', [
# don't change localhost to prevent errors when testing locally # don't change localhost to prevent errors when testing locally
('http://localhost:6012', 'http://static-logos.notify.tools/filename.png'), ('http://localhost:6012', 'http://static-logos.notify.tools/filename.png'),