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

Merge pull request #2753 from alphagov/template-preview-logo

Browse Source 
use letter branding object instead of letter_logo_filename
This commit is contained in:
Leo Hemsted
2019-02-13 14:04:10 +00:00
committed by GitHub
parent bd8ff7ec52 0e3d47bc08
commit 0ca48cd1b3
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/service.py
View File

@@ -29,7 +29,6 @@ class Service():
'inbound_api', 'inbound_api',
'letter_branding', 'letter_branding',
'letter_contact_block', 'letter_contact_block',
'letter_logo_filename',
'message_limit', 'message_limit',
'name', 'name',
'organisation_type', 'organisation_type',

2
app/template_previews.py
View File

@@ -11,7 +11,7 @@ class TemplatePreview:
'letter_contact_block': template.get('reply_to_text', ''), 'letter_contact_block': template.get('reply_to_text', ''),
'template': template, 'template': template,
'values': values, 'values': values,
'filename': current_service.letter_logo_filename, 'filename': current_service.letter_branding and current_service.letter_branding['filename']
} }
resp = requests.post( resp = requests.post(
'{}/preview.{}{}'.format( '{}/preview.{}{}'.format(

10
tests/app/test_template_previews.py
View File

@@ -40,16 +40,22 @@ def test_from_utils_template_calls_through(
'http://localhost:9999/preview.bar?page=99', 'http://localhost:9999/preview.bar?page=99',
), ),
]) ])
@pytest.mark.parametrize('letter_branding, expected_filename', [
({'filename': 'hm-government'}, 'hm-government'),
(None, None)
])
def test_from_database_object_makes_request( def test_from_database_object_makes_request(
mocker, mocker,
client, client,
partial_call, partial_call,
expected_url, expected_url,
letter_branding,
expected_filename,
mock_get_service_letter_template mock_get_service_letter_template
): ):
resp = Mock(content='a', status_code='b', headers={'c': 'd'}) resp = Mock(content='a', status_code='b', headers={'c': 'd'})
request_mock = mocker.patch('app.template_previews.requests.post', return_value=resp) request_mock = mocker.patch('app.template_previews.requests.post', return_value=resp)
mocker.patch('app.template_previews.current_service', letter_logo_filename='hm-government') mocker.patch('app.template_previews.current_service', letter_branding=letter_branding)
template = mock_get_service_letter_template('123', '456')['data'] template = mock_get_service_letter_template('123', '456')['data']
ret = partial_call(template=template) ret = partial_call(template=template)
@@ -62,7 +68,7 @@ def test_from_database_object_makes_request(
'letter_contact_block': None, 'letter_contact_block': None,
'template': template, 'template': template,
'values': None, 'values': None,
'filename': 'hm-government', 'filename': expected_filename,
} }
headers = {'Authorization': 'Token my-secret-key'} headers = {'Authorization': 'Token my-secret-key'}