mirror of
https://github.com/GSA/notifications-api.git
synced 2026-08-23 15:56:45 -04:00
Get tests passing locally
When we cloned the repository and started making modifications, we didn't initially keep tests in step. This commit tries to get us to a clean test run by skipping tests that are failing and removing some that we no longer expect to use (MMG, Firetext), with the intention that we will come back in future and update or remove them as appropriate. To find all tests skipped, search for `@pytest.mark.skip(reason="Needs updating for TTS:`. There will be a brief description of the work that needs to be done to get them passing, if known. Delete that line to make them run in a standard test run (`make test`).
This commit is contained in:
Christa Hartsock
@@ -1,5 +1,8 @@
|
||||
import pytest
|
||||
|
||||
from app import aws_sns_client
|
||||
|
||||
|
||||
def test_send_sms_successful_returns_aws_sns_response(notify_api, mocker):
|
||||
boto_mock = mocker.patch.object(aws_sns_client, '_client', create=True)
|
||||
mocker.patch.object(aws_sns_client, 'statsd_client', create=True)
|
||||
|
||||
@@ -71,7 +71,7 @@ def test_cbc_proxy_client_returns_correct_client(provider_name, expected_provide
|
||||
|
||||
|
||||
def test_cbc_proxy_lambda_client_has_correct_region(cbc_proxy_ee):
|
||||
assert cbc_proxy_ee._lambda_client._client_config.region_name == 'eu-west-2'
|
||||
assert cbc_proxy_ee._lambda_client._client_config.region_name == 'us-west-2'
|
||||
|
||||
|
||||
def test_cbc_proxy_lambda_client_has_correct_keys(cbc_proxy_ee):
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
from urllib.parse import parse_qs
|
||||
|
||||
import pytest
|
||||
import requests_mock
|
||||
from requests.exceptions import ConnectTimeout, ReadTimeout
|
||||
|
||||
from app.clients.sms.firetext import (
|
||||
SmsClientResponseException,
|
||||
get_firetext_responses,
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('detailed_status_code, result', [
|
||||
(None, ('delivered', None)), ('000', ('delivered', 'No error reported'))
|
||||
])
|
||||
def test_get_firetext_responses_should_return_correct_details_for_delivery(detailed_status_code, result):
|
||||
assert get_firetext_responses('0', detailed_status_code) == result
|
||||
|
||||
|
||||
@pytest.mark.parametrize('detailed_status_code, result', [
|
||||
(None, ('permanent-failure', None)), ('401', ('permanent-failure', 'Message Rejected'))
|
||||
])
|
||||
def test_get_firetext_responses_should_return_correct_details_for_bounced(detailed_status_code, result):
|
||||
assert get_firetext_responses('1', detailed_status_code) == result
|
||||
|
||||
|
||||
def test_get_firetext_responses_should_return_correct_details_for_complaint():
|
||||
assert get_firetext_responses('2') == ('pending', None)
|
||||
|
||||
|
||||
def test_get_firetext_responses_raises_KeyError_if_unrecognised_status_code():
|
||||
with pytest.raises(KeyError) as e:
|
||||
get_firetext_responses('99')
|
||||
assert '99' in str(e.value)
|
||||
|
||||
|
||||
def test_try_send_sms_successful_returns_firetext_response(mocker, mock_firetext_client):
|
||||
to = content = reference = 'foo'
|
||||
response_dict = {
|
||||
'data': [],
|
||||
'description': 'SMS successfully queued',
|
||||
'code': 0,
|
||||
'responseData': 1
|
||||
}
|
||||
|
||||
with requests_mock.Mocker() as request_mock:
|
||||
request_mock.post('https://example.com/firetext', json=response_dict, status_code=200)
|
||||
response = mock_firetext_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
response_json = response.json()
|
||||
assert response.status_code == 200
|
||||
assert response_json['code'] == 0
|
||||
assert response_json['description'] == 'SMS successfully queued'
|
||||
|
||||
|
||||
def test_try_send_sms_calls_firetext_correctly(mocker, mock_firetext_client):
|
||||
to = '+447234567890'
|
||||
content = 'my message'
|
||||
reference = 'my reference'
|
||||
response_dict = {
|
||||
'code': 0,
|
||||
}
|
||||
|
||||
with requests_mock.Mocker() as request_mock:
|
||||
request_mock.post('https://example.com/firetext', json=response_dict, status_code=200)
|
||||
mock_firetext_client.try_send_sms(to, content, reference, False, 'bar')
|
||||
|
||||
assert request_mock.call_count == 1
|
||||
assert request_mock.request_history[0].url == 'https://example.com/firetext'
|
||||
assert request_mock.request_history[0].method == 'POST'
|
||||
|
||||
request_args = parse_qs(request_mock.request_history[0].text)
|
||||
assert request_args['apiKey'][0] == 'foo'
|
||||
assert request_args['from'][0] == 'bar'
|
||||
assert request_args['to'][0] == '447234567890'
|
||||
assert request_args['message'][0] == content
|
||||
assert request_args['reference'][0] == reference
|
||||
|
||||
|
||||
def test_try_send_sms_calls_firetext_correctly_for_international(mocker, mock_firetext_client):
|
||||
to = '+607234567890'
|
||||
content = 'my message'
|
||||
reference = 'my reference'
|
||||
response_dict = {
|
||||
'code': 0,
|
||||
}
|
||||
|
||||
with requests_mock.Mocker() as request_mock:
|
||||
request_mock.post('https://example.com/firetext', json=response_dict, status_code=200)
|
||||
mock_firetext_client.try_send_sms(to, content, reference, True, 'bar')
|
||||
|
||||
assert request_mock.call_count == 1
|
||||
assert request_mock.request_history[0].url == 'https://example.com/firetext'
|
||||
assert request_mock.request_history[0].method == 'POST'
|
||||
|
||||
request_args = parse_qs(request_mock.request_history[0].text)
|
||||
assert request_args['apiKey'][0] == 'international'
|
||||
assert request_args['from'][0] == 'bar'
|
||||
assert request_args['to'][0] == '607234567890'
|
||||
assert request_args['message'][0] == content
|
||||
assert request_args['reference'][0] == reference
|
||||
|
||||
|
||||
def test_try_send_sms_raises_if_firetext_rejects(mocker, mock_firetext_client):
|
||||
to = content = reference = 'foo'
|
||||
response_dict = {
|
||||
'data': [],
|
||||
'description': 'Some kind of error',
|
||||
'code': 1,
|
||||
'responseData': ''
|
||||
}
|
||||
|
||||
with pytest.raises(SmsClientResponseException) as exc, requests_mock.Mocker() as request_mock:
|
||||
request_mock.post('https://example.com/firetext', json=response_dict, status_code=200)
|
||||
mock_firetext_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
assert "Invalid response JSON" in str(exc.value)
|
||||
|
||||
|
||||
def test_try_send_sms_raises_if_firetext_rejects_with_unexpected_data(mocker, mock_firetext_client):
|
||||
to = content = reference = 'foo'
|
||||
response_dict = {"something": "gone bad"}
|
||||
|
||||
with pytest.raises(SmsClientResponseException) as exc, requests_mock.Mocker() as request_mock:
|
||||
request_mock.post('https://example.com/firetext', json=response_dict, status_code=400)
|
||||
mock_firetext_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
assert "Request failed" in str(exc.value)
|
||||
|
||||
|
||||
def test_try_send_sms_raises_if_firetext_fails_to_return_json(notify_api, mock_firetext_client):
|
||||
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/firetext', text=response_dict, status_code=200)
|
||||
mock_firetext_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
assert "Invalid response JSON" in str(exc.value)
|
||||
|
||||
|
||||
def test_try_send_sms_raises_if_firetext_rejects_with_connect_timeout(rmock, mock_firetext_client):
|
||||
to = content = reference = 'foo'
|
||||
|
||||
with pytest.raises(SmsClientResponseException) as exc:
|
||||
rmock.register_uri('POST', 'https://example.com/firetext', exc=ConnectTimeout)
|
||||
mock_firetext_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
assert "Request failed" in str(exc.value)
|
||||
|
||||
|
||||
def test_try_send_sms_raises_if_firetext_rejects_with_read_timeout(rmock, mock_firetext_client):
|
||||
to = content = reference = 'foo'
|
||||
|
||||
with pytest.raises(SmsClientResponseException) as exc:
|
||||
rmock.register_uri('POST', 'https://example.com/firetext', exc=ReadTimeout)
|
||||
mock_firetext_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
assert "Request failed" in str(exc.value)
|
||||
@@ -1,117 +0,0 @@
|
||||
import pytest
|
||||
import requests_mock
|
||||
from requests.exceptions import ConnectTimeout, ReadTimeout
|
||||
|
||||
from app import mmg_client
|
||||
from app.clients.sms.mmg import SmsClientResponseException, get_mmg_responses
|
||||
|
||||
|
||||
@pytest.mark.parametrize('detailed_status_code, result', [
|
||||
(None, ('delivered', None)), ('5', ('delivered', 'Delivered to handset'))
|
||||
])
|
||||
def test_get_mmg_responses_should_return_correct_details_for_delivery(detailed_status_code, result):
|
||||
assert get_mmg_responses('3', detailed_status_code) == result
|
||||
|
||||
|
||||
@pytest.mark.parametrize('detailed_status_code, result', [
|
||||
(None, ('temporary-failure', None)), ('15', ('temporary-failure', 'Expired'))
|
||||
])
|
||||
def test_get_mmg_responses_should_return_correct_details_for_temporary_failure(detailed_status_code, result):
|
||||
assert get_mmg_responses('4', detailed_status_code) == result
|
||||
|
||||
|
||||
@pytest.mark.parametrize('status, detailed_status_code, result', [
|
||||
('2', None, ('permanent-failure', None)),
|
||||
('2', '12', ('permanent-failure', "Illegal equipment")),
|
||||
('5', None, ('permanent-failure', None)),
|
||||
('5', '20', ('permanent-failure', 'Rejected by anti-flooding mechanism'))
|
||||
])
|
||||
def test_get_mmg_responses_should_return_correct_details_for_bounced(status, detailed_status_code, result):
|
||||
assert get_mmg_responses(status, detailed_status_code) == result
|
||||
|
||||
|
||||
def test_get_mmg_responses_raises_KeyError_if_unrecognised_status_code():
|
||||
with pytest.raises(KeyError) as e:
|
||||
get_mmg_responses('99')
|
||||
assert '99' in str(e.value)
|
||||
|
||||
|
||||
def test_try_send_sms_successful_returns_mmg_response(notify_api, mocker):
|
||||
to = content = reference = 'foo'
|
||||
response_dict = {'Reference': 12345678}
|
||||
|
||||
with requests_mock.Mocker() as request_mock:
|
||||
request_mock.post('https://example.com/mmg', json=response_dict, status_code=200)
|
||||
response = mmg_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
response_json = response.json()
|
||||
assert response.status_code == 200
|
||||
assert response_json['Reference'] == 12345678
|
||||
|
||||
|
||||
def test_try_send_sms_calls_mmg_correctly(notify_api, mocker):
|
||||
to = '+447234567890'
|
||||
content = 'my message'
|
||||
reference = 'my reference'
|
||||
response_dict = {'Reference': 12345678}
|
||||
|
||||
with requests_mock.Mocker() as request_mock:
|
||||
request_mock.post('https://example.com/mmg', json=response_dict, status_code=200)
|
||||
mmg_client.try_send_sms(to, content, reference, False, 'testing')
|
||||
|
||||
assert request_mock.call_count == 1
|
||||
assert request_mock.request_history[0].url == 'https://example.com/mmg'
|
||||
assert request_mock.request_history[0].method == 'POST'
|
||||
|
||||
request_args = request_mock.request_history[0].json()
|
||||
assert request_args['reqType'] == 'BULK'
|
||||
assert request_args['MSISDN'] == to
|
||||
assert request_args['msg'] == content
|
||||
assert request_args['sender'] == 'testing'
|
||||
assert request_args['cid'] == reference
|
||||
assert request_args['multi'] is True
|
||||
|
||||
|
||||
def test_try_send_sms_raises_if_mmg_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/mmg', json=response_dict, status_code=400)
|
||||
mmg_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
assert "Request failed" in str(exc.value)
|
||||
|
||||
|
||||
def test_try_send_sms_raises_if_mmg_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/mmg', text=response_dict, status_code=200)
|
||||
mmg_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
assert "Invalid response JSON" in str(exc.value)
|
||||
|
||||
|
||||
def test_try_send_sms_raises_if_mmg_rejects_with_connect_timeout(rmock):
|
||||
to = content = reference = 'foo'
|
||||
|
||||
with pytest.raises(SmsClientResponseException) as exc:
|
||||
rmock.register_uri('POST', 'https://example.com/mmg', exc=ConnectTimeout)
|
||||
mmg_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
assert "Request failed" in str(exc.value)
|
||||
|
||||
|
||||
def test_try_send_sms_raises_if_mmg_rejects_with_read_timeout(rmock):
|
||||
to = content = reference = 'foo'
|
||||
|
||||
with pytest.raises(SmsClientResponseException) as exc:
|
||||
rmock.register_uri('POST', 'https://example.com/mmg', exc=ReadTimeout)
|
||||
mmg_client.try_send_sms(to, content, reference, False, 'sender')
|
||||
|
||||
assert "Request failed" in str(exc.value)
|
||||
@@ -15,7 +15,7 @@ def fake_client(notify_api):
|
||||
fake_client.init_app(notify_api, statsd_client)
|
||||
return fake_client
|
||||
|
||||
|
||||
@pytest.mark.skip(reason="Needs updating for TTS: New SMS client")
|
||||
def test_send_sms(fake_client, mocker):
|
||||
mock_send = mocker.patch.object(fake_client, 'try_send_sms')
|
||||
|
||||
@@ -31,7 +31,7 @@ def test_send_sms(fake_client, mocker):
|
||||
'to', 'content', 'reference', False, 'testing'
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.skip(reason="Needs updating for TTS: New SMS client")
|
||||
def test_send_sms_error(fake_client, mocker):
|
||||
mocker.patch.object(
|
||||
fake_client, 'try_send_sms', side_effect=SmsClientResponseException('error')
|
||||
|
||||
Reference in New Issue
Block a user