diff --git a/app/notify_client/inbound_number_client.py b/app/notify_client/inbound_number_client.py index 97f77259a..a12890974 100644 --- a/app/notify_client/inbound_number_client.py +++ b/app/notify_client/inbound_number_client.py @@ -12,7 +12,7 @@ class InboundNumberClient(NotifyAdminAPIClient): self.api_key = app.config['ADMIN_CLIENT_SECRET'] def get_all_inbound_sms_number_service(self): - return self.get('/inbound_number') + return self.get('/inbound-number') def get_inbound_sms_number_for_service(self, service_id): return self.get('/inbound-number/service/{}'.format(service_id)) diff --git a/app/templates/views/inbound_sms_admin.html b/app/templates/views/inbound_sms_admin.html index 209ced1e1..48c904be9 100644 --- a/app/templates/views/inbound_sms_admin.html +++ b/app/templates/views/inbound_sms_admin.html @@ -1,6 +1,4 @@ -{% extends "withnav_template.html" %} -{% from "components/table.html" import list_table, row, field, hidden_field_heading %} -{% from "components/page-footer.html" import page_footer %} +{% extends "views/platform-admin/_base_template.html" %} {% block service_page_title %} Inbound Numbers @@ -8,7 +6,7 @@ Inbound Numbers {% set table_headings = { 'field_headings': [ - '', 'Number', 'Status', 'Service', 'Created on' + 'Number', 'Status', 'Service', 'Created on' ], 'field_headings_visible': True, 'caption_visible': True @@ -20,7 +18,7 @@ Inbound Numbers font-weight:normal; } -{% block maincolumn_content %} +{% block platform_admin_content %}
@@ -31,6 +29,7 @@ Inbound Numbers
+ @@ -41,14 +40,12 @@ Inbound Numbers - {% for value in inbound_num_list.data: %} -
{{table_headings.field_headings[0]}} {{table_headings.field_headings[1]}} {{table_headings.field_headings[2]}}{{table_headings.field_headings[3]}}
{{loop.index}} {{value.number}} diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html index 8b245b40d..0866eb897 100644 --- a/app/templates/views/platform-admin/_base_template.html +++ b/app/templates/views/platform-admin/_base_template.html @@ -17,7 +17,8 @@ ('Trial mode services', url_for('main.trial_services')), ('Providers', url_for('main.view_providers')), ('Organisations', url_for('main.organisations')), - ('Letter jobs', url_for('main.letter_jobs')) + ('Letter jobs', url_for('main.letter_jobs')), + ('Inbound SMS numbers', url_for('main.inbound_sms_admin')) ] %}
  • diff --git a/tests/app/main/views/service_settings/test_inbound_sms_setting.py b/tests/app/main/views/service_settings/test_inbound_sms_setting.py index c4c072057..399761e2c 100644 --- a/tests/app/main/views/service_settings/test_inbound_sms_setting.py +++ b/tests/app/main/views/service_settings/test_inbound_sms_setting.py @@ -158,3 +158,16 @@ def test_set_text_message_sender_validation( assert response.status_code == 200 assert page.select(".error-message")[0].text.strip() == expected_error assert not mock_update_service.called + + +def test_if_sms_sender_set_then_form_populated( + logged_in_client, + service_one, + mock_get_inbound_number_for_service +): + service_one['sms_sender'] = 'elevenchars' + response = logged_in_client.get(url_for('main.service_set_sms_sender', service_id=service_one['id'])) + + assert response.status_code == 200 + page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') + assert page.find(id='sms_sender')['value'] == 'elevenchars' \ No newline at end of file diff --git a/tests/app/main/views/test_inbound_sms_admin.py b/tests/app/main/views/test_inbound_sms_admin.py new file mode 100644 index 000000000..df11144ee --- /dev/null +++ b/tests/app/main/views/test_inbound_sms_admin.py @@ -0,0 +1,34 @@ +from bs4 import BeautifulSoup +from flask import url_for + +sample_inbound_sms = {'data': [{"id": "activated", + "number": "0784121212", + "provider": "provider_one", + "service": {"id": "123234", "name": "Service One"}, + "active": True, + "created_at": "2017-08-15T13:30:30.12312", + "updated_at": "2017-08-15T13:30:30.12312"}, + {"id": "available", + "number": "0784131313", + "provider": "provider_one", + "service": None, + "active": True, + "created_at": "2017-08-15T13:30:30.12312", + "updated_at": None}, + {"id": "deactivated", + "number": "0784131313", + "provider": "provider_one", + "service": None, + "active": True, + "created_at": "2017-08-15T13:30:30.12312", + "updated_at": None} + ]} + + +def test_inbound_sms_admin(logged_in_platform_admin_client, mocker): + mocker.patch("app.inbound_number_client.get_all_inbound_sms_number_service", return_value=sample_inbound_sms) + response = logged_in_platform_admin_client.get(url_for("main.inbound_sms_admin")) + assert response.status_code == 200 + + page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') + assert page.h1.string.strip() == "Inbound SMS" diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index c9c20293c..d0d905520 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -752,19 +752,6 @@ def test_set_inbound_api_validation( assert not mock_update_service.called -def test_if_sms_sender_set_then_form_populated( - logged_in_client, - service_one, - mock_get_inbound_number_for_service -): - service_one['sms_sender'] = 'elevenchars' - response = logged_in_client.get(url_for('main.service_set_sms_sender', service_id=service_one['id'])) - - assert response.status_code == 200 - page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') - assert page.find(id='sms_sender')['value'] == 'elevenchars' - - @pytest.mark.parametrize('method', ['get', 'post']) def test_cant_set_letter_contact_block_if_service_cant_send_letters( logged_in_client,