From 0fac7125d2449bb39b15832112caf079ca21eb6e Mon Sep 17 00:00:00 2001 From: chrisw Date: Thu, 9 Nov 2017 16:09:00 +0000 Subject: [PATCH] Don't 'use my own number' if user doesn't have one --- app/main/views/send.py | 3 ++- tests/app/main/views/test_send.py | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 7835c9955..7cc21680d 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -410,7 +410,8 @@ def send_test_step(service_id, template_id, step_index): if ( request.endpoint == 'main.send_one_off_step' and step_index == 0 and - template.template_type != 'letter' + template.template_type != 'letter' and + not (template.template_type == 'sms' and current_user.mobile_number is None) ): skip_link = ( 'Use my {}'.format(first_column_headings[template.template_type][0]), diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 5d99b6d27..33363bd60 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -660,7 +660,6 @@ def test_send_one_off_has_skip_link( expected_link_text, expected_link_url, ): - template_mock(mocker) mocker.patch('app.main.views.send.get_page_count_for_letter', return_value=99) @@ -683,6 +682,23 @@ def test_send_one_off_has_skip_link( assert not skip_links +def test_skip_link_will_not_show_on_sms_one_off_if_service_has_no_mobile_number( + logged_in_client, + service_one, + fake_uuid, + mock_get_service_template, + active_user_with_permissions +): + active_user_with_permissions.mobile_number = None + response = logged_in_client.get( + url_for('main.send_one_off_step', service_id=service_one['id'], template_id=fake_uuid, step_index=0), + follow_redirects=True + ) + page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') + skip_links = page.select('a.top-gutter-4-3') + assert not skip_links + + @pytest.mark.parametrize('endpoint, expected_redirect, placeholders', [ ( 'main.send_test_step',