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 #2394 from alphagov/send-letter-filename-to-template-preview

Browse Source 
Pass letter logo filename to template preview
This commit is contained in:
Katie Smith
2018-10-19 10:58:08 +01:00
committed by GitHub
parent e8fb7343b2 0362265cb6
commit e100a0f218
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/notify_client/models.py
View File

@@ -278,6 +278,7 @@ class Service(dict):
'id', 'id',
'inbound_api', 'inbound_api',
'letter_contact_block', 'letter_contact_block',
'letter_logo_filename',
'message_limit', 'message_limit',
'name', 'name',
'organisation_type', 'organisation_type',

1
app/template_previews.py
View File

@@ -11,6 +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,
'dvla_org_id': current_service.dvla_organisation, 'dvla_org_id': current_service.dvla_organisation,
} }
resp = requests.post( resp = requests.post(

5
tests/app/test_template_previews.py
View File

@@ -49,7 +49,9 @@ def test_from_database_object_makes_request(
): ):
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', dvla_organisation='123') mocker.patch('app.template_previews.current_service',
dvla_organisation='123',
letter_logo_filename='hm-government')
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,6 +64,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',
'dvla_org_id': '123', 'dvla_org_id': '123',
} }
headers = {'Authorization': 'Token my-secret-key'} headers = {'Authorization': 'Token my-secret-key'}