Merge pull request #1628 from alphagov/remove-unused-code-for-sms-sender

Remove unused routes

app/main/views/service_settings.py

@@ -427,28 +427,6 @@ def service_edit_email_reply_to(service_id, reply_to_email_id):
         reply_to_email_address_id=reply_to_email_address['id'])
 
 
-@main.route("/services/<service_id>/service-settings/set-sms-sender", methods=['GET', 'POST'])
-@login_required
-@user_has_permissions('manage_settings', admin_override=True)
-def service_set_sms_sender(service_id):
-    form = ServiceSmsSenderForm()
-    if form.validate_on_submit():
-        if 'inbound_sms' in current_service['permissions']:
-            abort(403)
-        service_api_client.update_service(
-            current_service['id'],
-            sms_sender=form.sms_sender.data or None
-        )
-        return redirect(url_for('.service_settings', service_id=service_id))
-
-    if request.method == 'GET':
-        form.sms_sender.data = current_service.get('sms_sender')
-
-    return render_template(
-        'views/service-settings/set-sms-sender.html',
-        form=form)
-
-
 @main.route("/services/<service_id>/service-settings/set-inbound-number", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)

app/notify_client/inbound_number_client.py

@@ -19,6 +19,3 @@ class InboundNumberClient(NotifyAdminAPIClient):
 
     def get_inbound_sms_number_for_service(self, service_id):
         return self.get('/inbound-number/service/{}'.format(service_id))
-
-    def activate_inbound_sms_service(self, service_id):
-        return self.post(url='/inbound-number/service/{}'.format(service_id), data={})

app/templates/views/service-settings/set-sms-sender.html

@@ -1,32 +0,0 @@
-{% extends "withnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
-{% from "components/page-footer.html" import page_footer %}
-
-{% block service_page_title %}
-  Text message sender
-{% endblock %}
-
-{% block maincolumn_content %}
-
-  <h1 class="heading-large">Text message sender</h1>
-  <p>
-    This appears instead of a phone number when a user receives a
-    text message from your service.
-  <p>
-    If you set this to ‘GOVUK’ each message will begin with
-    ‘{{ current_service.name }}:’.
-  </p>
-  <form method="post">
-    {{ textbox(
-      form.sms_sender,
-      width='1-4',
-      hint='Up to 11 characters, letters, numbers and spaces only'
-    ) }}
-    {{ page_footer(
-      'Save',
-      back_link=url_for('.service_settings', service_id=current_service.id),
-      back_link_text='Back to settings'
-  ) }}
-  </form>
-
-{% endblock %}

tests/app/main/views/service_settings/test_inbound_sms_setting.py

@@ -1,4 +1,3 @@
-import app
 from flask import url_for
 from tests.conftest import normalize_spaces
 
@@ -59,22 +58,3 @@ def test_set_inbound_sms_when_service_already_has_sms(
     )
 
     assert normalize_spaces(page.select_one('main p').text) == "This service already has an inbound number"
-
-
-def test_set_text_message_sender_and_inbound_sms_permission_exists_return_403(
-        logged_in_client,
-        service_one,
-        mocker,
-):
-    service_one['permissions'] = ['inbound_sms']
-    mocker.patch('app.service_api_client.get_service', return_value={'data': service_one})
-    update_service_mock = mocker.patch('app.service_api_client.update_service_with_properties')
-
-    data = {"sms_sender": "elevenchars"}
-    response = logged_in_client.post(url_for('main.service_set_sms_sender', service_id=service_one['id']),
-                                     data=data)
-
-    assert response.status_code == 403
-
-    assert not update_service_mock.called
-    assert app.current_service['permissions'] == ['inbound_sms']