test written before merge Kens change

This commit is contained in:
venusbb
2017-08-11 09:17:01 +01:00
parent 981aa1aaea
commit 6ffd8b9b2e
3 changed files with 396 additions and 308 deletions
-1
View File
@@ -81,7 +81,6 @@ def service_settings(service_id):
inbound_api_url=inbound_api_url, inbound_api_url=inbound_api_url,
letter_contact_block=Field(current_service['letter_contact_block'], html='escape'), letter_contact_block=Field(current_service['letter_contact_block'], html='escape'),
inbound_number=disp_inbound_number inbound_number=disp_inbound_number
) )
+3 -3
View File
@@ -16,13 +16,13 @@ class InboundNumberClient(NotifyAdminAPIClient):
return self.get(endpoint) return self.get(endpoint)
def get_inbound_sms_number_for_service(self, service_id): def get_inbound_sms_number_for_service(self, service_id):
return self.get('/inbound_number/{}/number'.format(service_id)) return self.get('/inbound_number/service/{}'.format(service_id))
def activate_inbound_sms_service(self, service_id, inbound_number_id): def activate_inbound_sms_service(self, service_id, inbound_number_id):
return self.post(url='/inbound_number/{}/service/{}/activate'.format(inbound_number_id, service_id), data={}) return self.post(url='/inbound_number/{}/service/{}'.format(inbound_number_id, service_id), data={})
def reactivate_inbound_sms_service(self, inbound_number_id): def reactivate_inbound_sms_service(self, inbound_number_id):
return self.post(url='/inbound_number/{}/reactivate'.format(inbound_number_id), data={}) return self.post(url='/inbound_number/{}/on'.format(inbound_number_id), data={})
def deactivate_inbound_sms_permission(self, inbound_number_id): def deactivate_inbound_sms_permission(self, inbound_number_id):
return self.post(url='/inbound_number/{}/off'.format(inbound_number_id), data={}) return self.post(url='/inbound_number/{}/off'.format(inbound_number_id), data={})
+90 -1
View File
@@ -179,7 +179,6 @@ def test_if_can_receive_inbound_then_cant_change_sms_sender(
assert '0781239871' in response.get_data(as_text=True) assert '0781239871' in response.get_data(as_text=True)
def test_letter_contact_block_shows_none_if_not_set( def test_letter_contact_block_shows_none_if_not_set(
logged_in_client, logged_in_client,
service_one, service_one,
@@ -747,6 +746,96 @@ def test_set_text_message_sender(
) )
def test_get_inbound_number_in_service_settings(
logged_in_client,
mock_update_service,
mock_get_letter_organisations,
service_one,
mocker
):
mocker_get_inbound_number_fun = mocker.patch(
'app.inbound_number_client.get_inbound_sms_number_for_service',
return_value={'data': {'number': '077777777', 'id': 'some_uuid'}})
response = logged_in_client.get(url_for('main.service_settings', service_id=service_one['id']))
assert response.status_code == 200
mocker_get_inbound_number_fun.assert_called_once_with(service_one['id'])
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
element = page.find('span', {"id": "077777777"})
assert not element
def test_get_inbound_number_confirm_page(
logged_in_client,
mock_update_service,
service_one,
mocker
):
mocker_get_inbound_number_fun = mocker.patch(
'app.inbound_number_client.get_inbound_sms_number_for_service',
return_value={'data': {'number': '077777777', 'id': 'some_uuid'}})
response = logged_in_client.get(url_for('main.service_set_inbound_number', service_id=service_one['id']),
)
assert response.status_code == 200
assert '077777777' in response.get_data(as_text=True)
mocker_get_inbound_number_fun.assert_called_once_with(service_one['id'])
def test_if_currently_inbound_number_is_none(
logged_in_client,
mock_update_service,
service_one,
mocker
):
mocker_get_inbound_number_fun = mocker.patch(
'app.inbound_number_client.get_inbound_sms_number_for_service',
return_value={'data': ''})
mocker_get_available_inbound_number_fun = mocker.patch(
'app.inbound_number_client.get_available_inbound_number',
return_value={'data': {'number': '0123445678', 'id': 'some_uuid'}})
mocker_get_activate_inbound_number_fun = mocker.patch(
'app.inbound_number_client.activate_inbound_sms_service')
response = logged_in_client.post(url_for('main.service_set_inbound_number', service_id=service_one['id']),
)
assert response.status_code == 302
assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
mocker_get_inbound_number_fun.assert_called_once_with(service_one['id'])
mocker_get_available_inbound_number_fun.assert_called_once_with(service_one['id'])
mocker_get_activate_inbound_number_fun.assert_called_once_with(service_one['id'], 'some_uuid')
def test_if_currently_inbound_number_is_not_empty(
logged_in_client,
mock_update_service,
service_one,
mocker
):
mocker_get_inbound_number_fun = mocker.patch(
'app.inbound_number_client.get_inbound_sms_number_for_service',
return_value={'data': {'number': '077777777', 'id': 'some_uuid'}})
mocker_get_reactivate_inbound_number_fun = mocker.patch(
'app.inbound_number_client.reactivate_inbound_sms_service')
response = logged_in_client.post(url_for('main.service_set_inbound_number', service_id=service_one['id']),
)
assert response.status_code == 302
assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
mocker_get_inbound_number_fun.assert_called_once_with(service_one['id'])
mocker_get_reactivate_inbound_number_fun.assert_called_once_with('some_uuid')
def test_set_text_message_sender_and_inbound_sms( def test_set_text_message_sender_and_inbound_sms(
logged_in_client, logged_in_client,
service_one, service_one,