From 4ecf1685909cdbfeb36beac639b0d6b88a45988f Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 27 Nov 2017 14:45:34 +0000 Subject: [PATCH] Upate test for persist_notification --- .../test_process_notification.py | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/tests/app/notifications/test_process_notification.py b/tests/app/notifications/test_process_notification.py index 7c6a88914..18a5dbd03 100644 --- a/tests/app/notifications/test_process_notification.py +++ b/tests/app/notifications/test_process_notification.py @@ -73,7 +73,8 @@ def test_persist_notification_creates_and_save_to_db(sample_template, sample_api key_type=sample_api_key.key_type, job_id=sample_job.id, job_row_number=100, - reference="ref") + reference="ref", + reply_to_text=sample_template.service.get_default_sms_sender()) assert Notification.query.get(notification.id) is not None assert NotificationHistory.query.get(notification.id) is not None @@ -97,6 +98,7 @@ def test_persist_notification_creates_and_save_to_db(sample_template, sample_api assert notification_from_db.reference == notification_history_from_db.reference assert notification_from_db.client_reference == notification_history_from_db.client_reference assert notification_from_db.created_by_id == notification_history_from_db.created_by_id + assert notification_from_db.reply_to_text == sample_template.service.get_default_sms_sender() mocked_redis.assert_called_once_with(str(sample_template.service_id) + "-2016-01-01-count") @@ -205,6 +207,7 @@ def test_persist_notification_with_optionals(sample_job, sample_api_key, mocker) assert persisted_notification.phone_prefix == '44' assert persisted_notification.rate_multiplier == 1 assert persisted_notification.created_by_id == sample_job.created_by_id + assert not persisted_notification.reply_to_text @freeze_time("2016-01-01 11:09:00.061258") @@ -244,23 +247,6 @@ def test_persist_notification_increments_cache_if_key_exists(sample_template, sa sample_template.id) -def test_persist_notification_saves_reply_to_text(sample_template): - service_default_sms_sender = sample_template.service.get_default_sms_sender() - persist_notification(template_id=sample_template.id, - template_version=1, - recipient="+447111111122", - personalisation=None, - service=sample_template.service, - notification_type='sms', - api_key_id=None, - key_type='normal', - reply_to_text=service_default_sms_sender - ) - - notification = Notification.query.one() - assert notification.reply_to_text == service_default_sms_sender - - @pytest.mark.parametrize('research_mode, requested_queue, expected_queue, notification_type, key_type', [(True, None, 'research-mode-tasks', 'sms', 'normal'), (True, None, 'research-mode-tasks', 'email', 'normal'),