Merge branch 'master' into remove-initial-update-sms-sender

This commit is contained in:
Rebecca Law
2017-11-15 12:33:38 +00:00
17 changed files with 178 additions and 53 deletions

View File

@@ -335,7 +335,7 @@ def test_get_all_notifications_filter_by_template_type(client):
assert json_response['notifications'][0]['status'] == "created"
assert json_response['notifications'][0]['template'] == {
'id': str(email_template.id),
'uri': email_template.get_link(),
'uri': notification.template.get_link(),
'version': 1
}
assert json_response['notifications'][0]['email_address'] == "don.draper@scdp.biz"