From 6425dcbc9461ad2f69870acb65ba03d1a6fabe32 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 1 Jun 2017 13:03:22 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20the=20feature=20to=20=E2=80=98send=20t?= =?UTF-8?q?o=20one=20recipient=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘One-off’ is a bit wooly. Feels like our name for the thing. ‘Send to one recipient’ matches ‘Upload recipients’. This also means making the `

` on job page ‘Report’ for one-off messages. It doesn’t make sense to call the feature ‘send to one recipient’ when we’re not using the language of one-off any more. --- app/config.py | 2 +- app/main/views/send.py | 2 +- app/templates/views/templates/_template.html | 2 +- tests/app/main/views/test_send.py | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/config.py b/app/config.py index d48821d8b..f9b737929 100644 --- a/app/config.py +++ b/app/config.py @@ -57,7 +57,7 @@ class Config(object): CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload' DESKPRO_PERSON_EMAIL = 'donotreply@notifications.service.gov.uk' ACTIVITY_STATS_LIMIT_DAYS = 7 - TEST_MESSAGE_FILENAME = 'One-off message' + TEST_MESSAGE_FILENAME = 'Report' STATSD_ENABLED = False STATSD_HOST = "statsd.hostedgraphite.com" diff --git a/app/main/views/send.py b/app/main/views/send.py index 2ff3cef75..bfa47c33a 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -566,4 +566,4 @@ def get_send_test_page_title(template_type, help_argument): return 'Example text message' if template_type == 'letter': return 'Print a test letter' - return 'Send one-off message' + return 'Send to one recipient' diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html index 31ce14918..6a2add4df 100644 --- a/app/templates/views/templates/_template.html +++ b/app/templates/views/templates/_template.html @@ -14,7 +14,7 @@
- {{ 'Print a test letter' if template.template_type == 'letter' else 'Send one-off message' }} + {{ 'Print a test letter' if template.template_type == 'letter' else 'Send to one recipient' }}
{% endif %} diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index eeb7d6ecf..f5559bba8 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -295,7 +295,7 @@ def test_send_test_sms_message( assert response.status_code == 200 mock_s3_upload.assert_called_with( service_one['id'], - {'data': 'phone number\r\n07700 900762\r\n', 'file_name': 'One-off message'}, + {'data': 'phone number\r\n07700 900762\r\n', 'file_name': 'Report'}, 'eu-west-1' ) @@ -339,12 +339,12 @@ def test_send_test_step_redirects_if_session_not_setup( ( mock_get_service_template_with_placeholders, partial(url_for, 'main.send_test'), - 'Send one-off message', + 'Send to one recipient', ), ( mock_get_service_template_with_placeholders, partial(url_for, 'main.send_one_off'), - 'Send one-off message', + 'Send to one recipient', ), ( mock_get_service_template_with_placeholders, @@ -359,12 +359,12 @@ def test_send_test_step_redirects_if_session_not_setup( ( mock_get_service_email_template, partial(url_for, 'main.send_test'), - 'Send one-off message', + 'Send to one recipient', ), ( mock_get_service_email_template, partial(url_for, 'main.send_one_off'), - 'Send one-off message', + 'Send to one recipient', ), ( mock_get_service_letter_template, @@ -603,7 +603,7 @@ def test_send_test_email_message_without_placeholders( assert response.status_code == 200 mock_s3_upload.assert_called_with( service_one['id'], - {'data': 'email address\r\ntest@user.gov.uk\r\n', 'file_name': 'One-off message'}, + {'data': 'email address\r\ntest@user.gov.uk\r\n', 'file_name': 'Report'}, 'eu-west-1' ) @@ -824,7 +824,7 @@ def test_send_test_sms_message_puts_submitted_data_in_session_and_file( service_one['id'], { 'data': 'name,phone number\r\nJo,07700 900762\r\n', - 'file_name': 'One-off message' + 'file_name': 'Report' }, 'eu-west-1' )