Merge pull request #3526 from alphagov/remove-reach

Remove support for Reach provider

tests/app/celery/test_process_sms_client_response_tasks.py

@@ -18,7 +18,7 @@ def test_process_sms_client_response_raises_error_if_reference_is_not_a_valid_uu
             status='000', provider_reference='something-bad', client_name='sms-client')
 
 
-@pytest.mark.parametrize('client_name', ('Firetext', 'MMG', 'Reach'))
+@pytest.mark.parametrize('client_name', ('Firetext', 'MMG'))
 def test_process_sms_response_raises_client_exception_for_unknown_status(
     sample_notification,
     mocker,
@@ -43,9 +43,6 @@ def test_process_sms_response_raises_client_exception_for_unknown_status(
     ('3', '2', 'MMG', 'delivered', "Delivered to operator"),
     ('4', '27', 'MMG', 'temporary-failure', "Absent Subscriber"),
     ('5', '13', 'MMG', 'permanent-failure', "Sender id blacklisted"),
-    ('TODO-d', None, 'Reach', 'delivered', "TODO: Delivered"),
-    ('TODO-tf', None, 'Reach', 'temporary-failure', "TODO: Temporary failure"),
-    ('TODO-pf', None, 'Reach', 'permanent-failure', "TODO: Permanent failure"),
 ])
 def test_process_sms_client_response_updates_notification_status(
     sample_notification,

tests/app/clients/test_reach.py

@@ -1,84 +0,0 @@
-import pytest
-import requests_mock
-from requests.exceptions import ConnectTimeout, ReadTimeout
-
-from app import reach_client
-from app.clients.sms import SmsClientResponseException
-
-# TODO: tests for get_reach_responses
-
-
-def test_try_send_sms_successful_returns_reach_response(notify_api, mocker):
-    to = content = reference = 'foo'
-    response_dict = {}  # TODO
-
-    with requests_mock.Mocker() as request_mock:
-        request_mock.post('https://example.com/reach', json=response_dict, status_code=200)
-        response = reach_client.try_send_sms(to, content, reference, False, 'sender')
-
-    # response_json = response.json()
-    assert response.status_code == 200
-    # TODO: assertions
-
-
-def test_try_send_sms_calls_reach_correctly(notify_api, mocker):
-    to = '+447234567890'
-    content = 'my message'
-    reference = 'my reference'
-    response_dict = {}  # TODO
-
-    with requests_mock.Mocker() as request_mock:
-        request_mock.post('https://example.com/reach', json=response_dict, status_code=200)
-        reach_client.try_send_sms(to, content, reference, False, 'sender')
-
-    assert request_mock.call_count == 1
-    assert request_mock.request_history[0].url == 'https://example.com/reach'
-    assert request_mock.request_history[0].method == 'POST'
-
-    # request_args = request_mock.request_history[0].json()
-    # TODO: assertions
-
-
-def test_try_send_sms_raises_if_reach_rejects(notify_api, mocker):
-    to = content = reference = 'foo'
-    response_dict = {
-        'Error': 206,
-        'Description': 'Some kind of error'
-    }
-
-    with pytest.raises(SmsClientResponseException) as exc, requests_mock.Mocker() as request_mock:
-        request_mock.post('https://example.com/reach', json=response_dict, status_code=400)
-        reach_client.try_send_sms(to, content, reference, False, 'sender')
-
-    assert "Request failed" in str(exc)
-
-
-def test_try_send_sms_raises_if_reach_fails_to_return_json(notify_api, mocker):
-    to = content = reference = 'foo'
-    response_dict = 'NOT AT ALL VALID JSON {"key" : "value"}}'
-
-    with pytest.raises(SmsClientResponseException) as exc, requests_mock.Mocker() as request_mock:
-        request_mock.post('https://example.com/reach', text=response_dict, status_code=200)
-        reach_client.try_send_sms(to, content, reference, False, 'sender')
-
-    assert 'Invalid response JSON' in str(exc.value)
-
-
-def test_try_send_sms_raises_if_reach_rejects_with_connect_timeout(rmock):
-    to = content = reference = 'foo'
-
-    with pytest.raises(SmsClientResponseException) as exc:
-        rmock.register_uri('POST', 'https://example.com/reach', exc=ConnectTimeout)
-        reach_client.try_send_sms(to, content, reference, False, 'sender')
-
-    assert 'Request failed' in str(exc.value)
-
-
-def test_try_send_sms_raises_if_reach_rejects_with_read_timeout(rmock):
-    to = content = reference = 'foo'
-
-    with pytest.raises(SmsClientResponseException) as exc:
-        rmock.register_uri('POST', 'https://example.com/reach', exc=ReadTimeout)
-        reach_client.try_send_sms(to, content, reference, False, 'sender')
-
-    assert 'Request failed' in str(exc.value)

tests/app/notifications/test_notifications_sms_callbacks.py

@@ -17,13 +17,6 @@ def mmg_post(client, data):
         headers=[('Content-Type', 'application/json')])
 
 
-def reach_post(client, data):
-    return client.post(
-        path='/notifications/sms/reach',
-        data=data,
-        headers=[('Content-Type', 'application/json')])
-
-
 def test_firetext_callback_should_not_need_auth(client, mocker):
     mocker.patch('app.notifications.notifications_sms_callback.process_sms_client_response')
     data = 'mobile=441234123123&status=0&reference=notification_id&time=2016-03-10 14:17:00'
@@ -142,24 +135,6 @@ def test_mmg_callback_should_return_200_and_call_task_with_valid_data(client, mo
     )
 
 
-# TODO: more tests about edge cases for this provider
-def test_reach_callback_should_return_200_and_call_task_with_valid_data(client, mocker):
-    mock_celery = mocker.patch(
-        'app.notifications.notifications_sms_callback.process_sms_client_response.apply_async')
-    data = json.dumps({"data": "TODO"})
-
-    response = reach_post(client, data)
-
-    assert response.status_code == 200
-    json_data = json.loads(response.data)
-    assert json_data['result'] == 'success'
-
-    mock_celery.assert_called_once_with(
-        ['TODO-d', 'notification_id', 'Reach', 'something'],
-        queue='sms-callbacks',
-    )
-
-
 def test_validate_callback_data_returns_none_when_valid():
     form = {'status': 'good',
             'reference': 'send-sms-code'}

tests/app/provider_details/test_rest.py

@@ -11,7 +11,7 @@ def test_get_provider_details_returns_all_providers(admin_request, notify_db_ses
     json_resp = admin_request.get('provider_details.get_providers')['provider_details']
 
     assert len(json_resp) > 0
-    assert {'ses', 'firetext', 'mmg', 'dvla'} < {x['identifier'] for x in json_resp}
+    assert {'ses', 'firetext', 'mmg', 'dvla'} <= {x['identifier'] for x in json_resp}
 
 
 def test_get_provider_details_by_id(client, notify_db):