Added a hint for Receives replies

This commit is contained in:
Rebecca Law
2017-11-02 14:58:14 +00:00
parent 2ea921952f
commit 83bfc50884
3 changed files with 24 additions and 2 deletions

View File

@@ -192,7 +192,8 @@ def set_sender(service_id, template_id):
sender_choices=sender_context['value_and_label'],
sender_label=sender_context['description']
)
option_hints = {sender_context['default_id']: 'Default'}
option_hints = {sender_context['default_id']: 'Default',
sender_context['receives_text_message']: 'Receives replies'}
if form.validate_on_submit():
session['sender_id'] = form.sender.data
@@ -231,6 +232,9 @@ def get_sender_context(sender_details, template_type):
sender_format = context['field_name']
context['default_id'] = next(sender['id'] for sender in sender_details if sender['is_default'])
if template_type == 'sms':
context['receives_text_message'] = next(
sender['id'] for sender in sender_details if sender['inbound_number_id'])
context['value_and_label'] = [(sender['id'], sender[sender_format]) for sender in sender_details]
return context

View File

@@ -61,7 +61,6 @@ class NotificationApiClient(NotifyAdminAPIClient):
'personalisation': personalisation,
}
if sender_id:
print(sender_id)
data['sender_id'] = sender_id
data = _attach_current_user(data)
return self.post(url='/service/{}/send-notification'.format(service_id), data=data)

View File

@@ -107,6 +107,25 @@ def test_default_sender_is_checked_and_has_hint(
assert not page.select('.multiple-choice input')[2].has_attr('checked')
def test_sms_sender_is_has_receives_replies_hint(
client_request,
service_one,
fake_uuid,
mock_get_service_template,
multiple_sms_senders
):
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) == "Receives replies"
assert not page.select('.multiple-choice input')[1].has_attr('checked')
assert not page.select('.multiple-choice input')[2].has_attr('checked')
@pytest.mark.parametrize('template_mock, sender_data', [
(
mock_get_service_email_template,