darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-31 15:15:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #784 from alphagov/cloudfront-fix

Browse Source 
don't use cloudfront on preview or staging
This commit is contained in:
Leo Hemsted
2016-12-29 12:23:52 +00:00
committed by GitHub
parent 9e27574298 d4f23f1e44
commit 8596cc500f
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/delivery/send_to_providers.py
View File

@@ -135,8 +135,11 @@ def get_logo_url(base_url, branding_path, logo_file):
base_url = parse.urlparse(base_url)
netloc = base_url.netloc
if base_url.netloc.startswith('localhost'):
netloc = 'localhost:6012'
if (
base_url.netloc.startswith('localhost') or
# covers both preview and staging
'notify.works' in base_url.netloc
):
path = '/static' + branding_path + logo_file
else:
if base_url.netloc.startswith('www'):

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

@@ -397,8 +397,15 @@ def test_get_html_email_renderer_prepends_logo_path(notify_api):
('http://localhost:6012', 'http://localhost:6012/static/sub-path/filename.png'),
# on other environments, replace www with staging
('https://www.notifications.service.gov.uk', 'https://static.notifications.service.gov.uk/sub-path/filename.png'),
('https://www.notify.works', 'https://static.notify.works/sub-path/filename.png'),
('https://notify.works', 'https://static.notify.works/sub-path/filename.png'),
# staging and preview do not have cloudfront running, so should act as localhost
pytest.mark.xfail(('https://www.notify.works', 'https://static.notify.works/sub-path/filename.png')),
pytest.mark.xfail(('https://www.staging-notify.works', 'https://static.notify.works/sub-path/filename.png')),
pytest.mark.xfail(('https://notify.works', 'https://static.notify.works/sub-path/filename.png')),
pytest.mark.xfail(('https://staging-notify.works', 'https://static.notify.works/sub-path/filename.png')),
# these tests should be removed when cloudfront works on staging/preview
('https://www.notify.works', 'https://www.notify.works/static/sub-path/filename.png'),
('https://www.staging-notify.works', 'https://www.staging-notify.works/static/sub-path/filename.png'),
])
def test_get_logo_url_works_for_different_environments(base_url, expected_url):
branding_path = '/sub-path/'