Allow one-off email sending to select the reply-to address

tests/app/main/views/test_send.py

@@ -26,6 +26,12 @@ from tests.conftest import (
     SERVICE_ONE_ID,
     mock_get_service,
     mock_get_live_service,
+    multiple_reply_to_email_addresses,
+    multiple_letter_contact_blocks,
+    multiple_sms_senders,
+    no_reply_to_email_addresses,
+    no_letter_contact_blocks,
+    no_sms_senders
 )
 
 template_types = ['email', 'sms']
@@ -35,6 +41,101 @@ test_spreadsheet_files = glob(path.join('tests', 'spreadsheet_files', '*'))
 test_non_spreadsheet_files = glob(path.join('tests', 'non_spreadsheet_files', '*'))
 
 
+@pytest.mark.parametrize('template_mock, sender_data, expected_title, expected_description', [
+    (
+        mock_get_service_email_template,
+        multiple_reply_to_email_addresses,
+        'Choose where to send replies',
+        'Select an email address that recipients can reply to'
+    ),
+])
+def test_show_correct_title_and_description_for_sender_type(
+    client_request,
+    service_one,
+    fake_uuid,
+    template_mock,
+    sender_data,
+    expected_title,
+    expected_description,
+    mocker
+):
+    template_mock(mocker)
+    sender_data(mocker)
+
+    page = client_request.get(
+        '.set_sender',
+        service_id=service_one['id'],
+        template_id=fake_uuid
+    )
+
+    assert page.select_one('h1').text == expected_title
+    assert normalize_spaces(page.select_one('legend').text) == expected_description
+
+
+def test_default_sender_is_checked_and_has_hint(
+    client_request,
+    service_one,
+    fake_uuid,
+    mock_get_service_email_template,
+    multiple_reply_to_email_addresses
+):
+    page = client_request.get(
+        '.set_sender',
+        service_id=service_one['id'],
+        template_id=fake_uuid
+    )
+
+    assert page.select('.multiple-choice input')[0].has_attr('checked')
+    assert normalize_spaces(page.select_one('.multiple-choice label .block-label-hint').text) == "Default"
+    assert not page.select('.multiple-choice input')[1].has_attr('checked')
+    assert not page.select('.multiple-choice input')[2].has_attr('checked')
+
+
+def test_sender_session_is_present_after_selected(
+    logged_in_client,
+    service_one,
+    fake_uuid,
+    mock_get_service_email_template,
+    multiple_reply_to_email_addresses
+):
+    response = logged_in_client.post(
+        url_for('.set_sender', service_id=service_one['id'], template_id=fake_uuid),
+        data={'sender': '1234'}
+    )
+
+    with logged_in_client.session_transaction() as session:
+        assert session['sender_id'] == '1234'
+
+
+@pytest.mark.parametrize('template_mock, sender_data', [
+    (
+        mock_get_service_email_template,
+        no_reply_to_email_addresses,
+    ),
+])
+def test_set_sender_redirects_if_no_sender_data(
+    logged_in_client,
+    service_one,
+    fake_uuid,
+    template_mock,
+    sender_data,
+    mocker
+):
+    template_mock(mocker)
+    sender_data(mocker)
+    response = logged_in_client.get(
+        url_for('.set_sender', service_id=service_one['id'], template_id=fake_uuid)
+    )
+    assert response.status_code == 302
+    expected_url = url_for(
+        '.send_one_off',
+        service_id=service_one['id'],
+        template_id=fake_uuid,
+        _external=True,
+    )
+    assert response.location == expected_url
+
+
 def test_that_test_files_exist():
     assert len(test_spreadsheet_files) == 8
     assert len(test_non_spreadsheet_files) == 6
@@ -1965,7 +2066,8 @@ def test_send_notification_submits_data(
         service_one['id'],
         template_id=fake_uuid,
         recipient='07700900001',
-        personalisation={'a': 'b'}
+        personalisation={'a': 'b'},
+        sender_id=None
     )
 
 

tests/app/main/views/test_templates.py

@@ -116,11 +116,11 @@ def test_should_show_page_for_one_template(
     ),
     (
         ['send_texts', 'send_emails', 'send_letters'],
-        ['.send_messages', '.send_one_off']
+        ['.send_messages', '.set_sender']
     ),
     (
         ['send_texts', 'send_emails', 'send_letters', 'manage_templates'],
-        ['.send_messages', '.send_one_off', '.edit_service_template']
+        ['.send_messages', '.set_sender', '.edit_service_template']
     ),
 ])
 def test_should_be_able_to_view_a_template_with_links(
@@ -335,6 +335,30 @@ def test_should_not_allow_creation_of_a_template_without_correct_permission(
     )
 
 
+@pytest.mark.parametrize('fixture,  expected_status_code', [
+    (mock_get_service_email_template, 200),
+    (mock_get_service_template, 302),
+    (mock_get_service_letter_template, 302),
+])
+def test_should_redirect_to_one_off_if_template_type_is_not_email(
+    logged_in_client,
+    active_user_with_permissions,
+    multiple_reply_to_email_addresses,
+    service_one,
+    fake_uuid,
+    mocker,
+    fixture,
+    expected_status_code
+):
+    fixture(mocker)
+
+    page = logged_in_client.get(
+        url_for('.set_sender', service_id=service_one['id'], template_id=fake_uuid)
+    )
+
+    assert page.status_code == expected_status_code
+
+
 def test_should_redirect_when_saving_a_template(
     logged_in_client,
     active_user_with_permissions,

tests/app/notify_client/test_notification_client.py

@@ -42,7 +42,13 @@ def test_client_gets_notifications_for_service_and_job_by_page(mocker, arguments
 
 def test_send_notification(mocker, logged_in_client, active_user_with_permissions):
     mock_post = mocker.patch('app.notify_client.notification_api_client.NotificationApiClient.post')
-    NotificationApiClient().send_notification('foo', template_id='bar', recipient='07700900001', personalisation=None)
+    NotificationApiClient().send_notification(
+        'foo',
+        template_id='bar',
+        recipient='07700900001',
+        personalisation=None,
+        sender_id=None
+    )
     mock_post.assert_called_once_with(
         url='/service/foo/send-notification',
         data={