darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-18 16:12:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changed the body of the request to use the right phone number, the phone number is not currently used in the callback logic but if it was then this may cause a problem.

Browse Source 
Changed the test to use a 077009 series phone number.
This commit is contained in:
Rebecca Law
2017-01-23 10:43:33 +00:00
parent 5e3bb08860
commit fb27a2d4c9
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/celery/research_mode_tasks.py
View File

@@ -27,7 +27,12 @@ def send_sms_response(provider, reference, to):
# we need to send a pending status updated then a permanent-failure # we need to send a pending status updated then a permanent-failure
if body['status'] == '2': # pending status if body['status'] == '2': # pending status
make_request(SMS_TYPE, provider, body, headers) make_request(SMS_TYPE, provider, body, headers)
body = firetext_callback(reference, perm_fail) # 1 is a declined status for firetext, will result in a temp-failure
body = {'mobile': to,
'status': "1",
'time': '2016-03-10 14:17:00',
'reference': reference
}
make_request(SMS_TYPE, provider, body, headers) make_request(SMS_TYPE, provider, body, headers)

13
tests/app/celery/test_research_mode_tasks.py
View File

@@ -25,18 +25,21 @@ def test_make_mmg_callback(notify_api, rmock):
assert json.loads(rmock.request_history[0].text)['MSISDN'] == '07700900001' assert json.loads(rmock.request_history[0].text)['MSISDN'] == '07700900001'
def test_make_firetext_callback(notify_api, rmock): @pytest.mark.parametrize("phone_number",
["07700900001", "07700900002", "07700900003",
"07700900236"])
def test_make_firetext_callback(notify_api, rmock, phone_number):
endpoint = "http://localhost:6011/notifications/sms/firetext" endpoint = "http://localhost:6011/notifications/sms/firetext"
rmock.request( rmock.request(
"POST", "POST",
endpoint, endpoint,
json="some data", json="some data",
status_code=200) status_code=200)
send_sms_response("firetext", "1234", "07700900001") send_sms_response("firetext", "1234", phone_number)
assert rmock.called assert rmock.called
assert rmock.request_history[0].url == endpoint assert rmock.request_history[0].url == endpoint
assert 'mobile=07700900001' in rmock.request_history[0].text assert 'mobile={}'.format(phone_number) in rmock.request_history[0].text
def test_make_ses_callback(notify_api, rmock): def test_make_ses_callback(notify_api, rmock):
@@ -52,7 +55,7 @@ def test_make_ses_callback(notify_api, rmock):
@pytest.mark.parametrize("phone_number", ["07700900001", "+447700900001", "7700900001", "+44 7700900001", @pytest.mark.parametrize("phone_number", ["07700900001", "+447700900001", "7700900001", "+44 7700900001",
"+4407513453456"]) "+447700900236"])
def test_delivered_mmg_callback(phone_number): def test_delivered_mmg_callback(phone_number):
data = json.loads(mmg_callback("1234", phone_number)) data = json.loads(mmg_callback("1234", phone_number))
assert data['MSISDN'] == phone_number assert data['MSISDN'] == phone_number
@@ -80,7 +83,7 @@ def test_temp_failure_mmg_callback(phone_number):
@pytest.mark.parametrize("phone_number", ["07700900001", "+447700900001", "7700900001", "+44 7700900001", @pytest.mark.parametrize("phone_number", ["07700900001", "+447700900001", "7700900001", "+44 7700900001",
"+4407513453456"]) "+447700900256"])
def test_delivered_firetext_callback(phone_number): def test_delivered_firetext_callback(phone_number):
assert firetext_callback('1234', phone_number) == { assert firetext_callback('1234', phone_number) == {
'mobile': phone_number, 'mobile': phone_number,