Merge branch 'master' into reduce-updates-to-notification

This commit is contained in:
Rebecca Law
2018-09-20 14:48:40 +01:00
13 changed files with 132 additions and 34 deletions

View File

@@ -161,11 +161,12 @@ def test_send_notification_with_placeholders_replaced(notify_api, sample_email_t
),
'6',
),
pytest.mark.xfail((
pytest.param(
None,
('we consider None equivalent to missing personalisation'),
'',
)),
marks=pytest.mark.xfail
),
])
def test_send_notification_with_placeholders_replaced_with_unusual_types(
client,

View File

@@ -25,6 +25,7 @@ def test_create_letter_notification_creates_notification(sample_letter_template,
assert notification.key_type == sample_api_key.key_type
assert notification.reference is not None
assert notification.client_reference is None
assert notification.postage == 'second'
def test_create_letter_notification_sets_reference(sample_letter_template, sample_api_key):