Merge branch 'master' into add_proxy_header_check

app/main/views/send.py

@@ -217,8 +217,8 @@ def set_sender(service_id, template_id):
 def get_sender_context(sender_details, template_type):
     context = {
         'email': {
-            'title': 'Send to one recipient',
-            'description': 'Where should replies go?',
+            'title': 'Where should replies come back to?',
+            'description': 'Where should replies come back to?',
             'field_name': 'email_address'
         },
         'letter': {
@@ -227,7 +227,7 @@ def get_sender_context(sender_details, template_type):
             'field_name': 'contact_block'
         },
         'sms': {
-            'title': 'Send to one recipient',
+            'title': 'Who should the message come from?',
             'description': 'Who should the message come from?',
             'field_name': 'sms_sender'
         }
@@ -421,7 +421,11 @@ def send_test_step(service_id, template_id, step_index):
         skip_link = None
     return render_template(
         'views/send-test.html',
-        page_title=get_send_test_page_title(template.template_type, get_help_argument()),
+        page_title=get_send_test_page_title(
+            template.template_type,
+            get_help_argument(),
+            entering_recipient=not session['recipient']
+        ),
         template=template,
         form=form,
         skip_link=skip_link,
@@ -711,12 +715,14 @@ def all_placeholders_in_session(placeholders):
     )
 
 
-def get_send_test_page_title(template_type, help_argument):
+def get_send_test_page_title(template_type, help_argument, entering_recipient):
     if help_argument:
         return 'Example text message'
     if template_type == 'letter':
         return 'Print a test letter'
-    return 'Send to one recipient'
+    if entering_recipient:
+        return 'Who should this message be sent to?'
+    return 'Personalise this message'
 
 
 def get_back_link(service_id, template_id, step_index):

app/templates/components/radios.html

@@ -2,12 +2,15 @@
   field,
   hint=None,
   disable=[],
-  option_hints={}
+  option_hints={},
+  hide_legend=False
 ) %}
   <div class="form-group {% if field.errors %} form-group-error{% endif %}">
     <fieldset>
       <legend class="form-label">
-        {{ field.label.text|safe }}
+        {% if hide_legend %}<span class="visually-hidden">{% endif %}
+          {{ field.label.text|safe }}
+        {% if hide_legend %}</span>{% endif %}
         {% if field.errors %}
           <span class="error-message" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
             {{ field.errors[0] }}

app/templates/views/templates/set-sender.html

@@ -13,10 +13,10 @@
     <div class="column-three-quarters">
       <form method="post">
         {{ radios(
-          form.sender, 
-          option_hints=option_hints
-          ) 
-        }}
+          form.sender,
+          option_hints=option_hints,
+          hide_legend=True
+        ) }}
         {{ page_footer(
           'Continue',
           back_link=url_for('.view_template', service_id=current_service.id, template_id=template_id),

tests/app/main/views/test_send.py

@@ -44,14 +44,14 @@ test_non_spreadsheet_files = glob(path.join('tests', 'non_spreadsheet_files', '*
     (
         mock_get_service_email_template,
         multiple_reply_to_email_addresses,
-        'Send to one recipient',
-        'Where should replies go?',
+        'Where should replies come back to?',
+        'Where should replies come back to?',
     ),
     (
         mock_get_service_template,
         multiple_sms_senders,
-        'Send to one recipient',
-        'Who should the message come from?'
+        'Who should the message come from?',
+        'Who should the message come from?',
     )
 ])
 def test_show_correct_title_and_description_for_sender_type(
@@ -74,7 +74,9 @@ def test_show_correct_title_and_description_for_sender_type(
     )
 
     assert page.select_one('h1').text == expected_title
-    assert normalize_spaces(page.select_one('legend').text) == expected_description
+
+    for element in ('legend', 'legend .visually-hidden'):
+        assert normalize_spaces(page.select_one(element).text) == expected_description
 
 
 @pytest.mark.parametrize('template_mock, sender_data', [
@@ -573,13 +575,13 @@ def test_send_one_off_does_not_send_without_the_correct_permissions(
     (
         mock_get_service_template_with_placeholders,
         partial(url_for, 'main.send_test'),
-        'Send to one recipient',
+        'Personalise this message',
         False,
     ),
     (
         mock_get_service_template_with_placeholders,
         partial(url_for, 'main.send_one_off'),
-        'Send to one recipient',
+        'Who should this message be sent to?',
         False,
     ),
     (
@@ -597,13 +599,13 @@ def test_send_one_off_does_not_send_without_the_correct_permissions(
     (
         mock_get_service_email_template,
         partial(url_for, 'main.send_test'),
-        'Send to one recipient',
+        'Personalise this message',
         False,
     ),
     (
         mock_get_service_email_template,
         partial(url_for, 'main.send_one_off'),
-        'Send to one recipient',
+        'Who should this message be sent to?',
         False,
     ),
     (