From 58503c855a2c934bde16ecc42966d0234504c2ac Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Mon, 22 May 2017 14:43:46 +0100 Subject: [PATCH] set sms_sender to be 'GOVUK' if not otherwise specified this is a precursor to making the column non-nullable --- tests/app/service/test_rest.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 46adbba1b..2912060af 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -240,7 +240,11 @@ def test_create_service(client, sample_user): assert json_resp['data']['email_from'] == 'created.service' assert not json_resp['data']['research_mode'] assert json_resp['data']['dvla_organisation'] == '001' +<<<<<<< HEAD assert json_resp['data']['sms_sender'] == current_app.config['FROM_NUMBER'] +======= + assert json_resp['data']['sms_sender'] == 'GOVUK' +>>>>>>> set sms_sender to be 'GOVUK' if not otherwise specified service_db = Service.query.get(json_resp['data']['id']) assert service_db.name == 'created service'