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

Merge pull request #402 from alphagov/firetext-research-400s

Browse Source 
fix firetext research mode requests
This commit is contained in:
Leo Hemsted
2016-06-09 15:25:00 +01:00
parent c14cb5c291 fd2a0a0b10
commit d0d2d0dbc8
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/celery/research_mode_tasks.py
View File

@@ -19,7 +19,7 @@ def send_sms_response(provider, reference, to):
body = mmg_callback(reference, to) body = mmg_callback(reference, to)
headers = {"Content-type": "application/json"} headers = {"Content-type": "application/json"}
else: else:
headers = {"Content-type": "text/plain"} headers = {"Content-type": "application/x-www-form-urlencoded"}
body = firetext_callback(reference, to) body = firetext_callback(reference, to)
make_request('sms', provider, body, headers) make_request('sms', provider, body, headers)
@@ -92,7 +92,12 @@ def firetext_callback(notification_id, to):
status = "1" status = "1"
else: else:
status = "0" status = "0"
return 'mobile={}&status={}&time=2016-03-10 14:17:00&reference={}'.format(to, status, notification_id) return {
'mobile': to,
'status': status,
'time': '2016-03-10 14:17:00',
'reference': notification_id
}
def ses_notification_callback(reference): def ses_notification_callback(reference):

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

@@ -20,6 +20,8 @@ def test_make_mmg_callback(notify_api, rmock):
send_sms_response("mmg", "1234", "07811111111") send_sms_response("mmg", "1234", "07811111111")
assert rmock.called assert rmock.called
assert rmock.request_history[0].url == endpoint
assert json.loads(rmock.request_history[0].text)['MSISDN'] == '07811111111'
def test_make_firetext_callback(notify_api, rmock): def test_make_firetext_callback(notify_api, rmock):
@@ -32,6 +34,8 @@ def test_make_firetext_callback(notify_api, rmock):
send_sms_response("firetext", "1234", "07811111111") send_sms_response("firetext", "1234", "07811111111")
assert rmock.called assert rmock.called
assert rmock.request_history[0].url == endpoint
assert 'mobile=07811111111' in rmock.request_history[0].text
def test_make_ses_callback(notify_api, rmock): def test_make_ses_callback(notify_api, rmock):
@@ -71,11 +75,21 @@ def test_temp_failure_mmg_callback():
def test_delivered_firetext_callback(): def test_delivered_firetext_callback():
assert firetext_callback("1234", "07811111111") == "mobile=07811111111&status=0&time=2016-03-10 14:17:00&reference=1234" # noqa assert firetext_callback('1234', '07811111111') == {
'mobile': '07811111111',
'status': '0',
'time': '2016-03-10 14:17:00',
'reference': '1234'
}
def test_failure_firetext_callback(): def test_failure_firetext_callback():
assert firetext_callback("1234", "07822222222") == "mobile=07822222222&status=1&time=2016-03-10 14:17:00&reference=1234" # noqa assert firetext_callback('1234', '07822222222') == {
'mobile': '07822222222',
'status': '1',
'time': '2016-03-10 14:17:00',
'reference': '1234'
}
def test_delivered_ses_callback(): def test_delivered_ses_callback():