darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into split-sms-and-retry

Browse Source
This commit is contained in:
Martyn Inglis
2016-06-07 11:10:17 +01:00
parent 642aa2890e dbf6724511
commit 37fe2342ae
12 changed files with 170 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/app/conftest.py
View File

@@ -4,6 +4,7 @@ import uuid
from datetime import (datetime, date)
import pytest
from flask import current_app
from app import db
from app.models import (
@@ -307,15 +308,6 @@ def sample_email_job(notify_db,
return job
@pytest.fixture(scope='function')
def mock_secret_code(mocker):
def _create():
return '11111'
mock_class = mocker.patch('app.dao.users_dao.create_secret_code', side_effect=_create)
return mock_class
@pytest.fixture(scope='function')
def sample_notification(notify_db,
notify_db_session,
@@ -563,3 +555,37 @@ def mock_mmg_client(mocker, statsd_client=None):
})
client.init_app(current_app, statsd_client)
return client
@pytest.fixture(scope='function')
def sms_code_template(notify_db,
notify_db_session):
user = sample_user(notify_db, notify_db_session)
service = Service.query.get(current_app.config['NOTIFY_SERVICE_ID'])
if not service:
data = {
'id': current_app.config['NOTIFY_SERVICE_ID'],
'name': 'Notify Service',
'message_limit': 1000,
'active': True,
'restricted': False,
'email_from': 'notify.service',
'created_by': user
}
service = Service(**data)
db.session.add(service)
template = Template.query.get(current_app.config['SMS_CODE_TEMPLATE_ID'])
if not template:
data = {
'id': current_app.config['SMS_CODE_TEMPLATE_ID'],
'name': 'Sms code template',
'template_type': 'sms',
'content': '((verify_code))',
'service': service,
'created_by': user,
'archived': False
}
template = Template(**data)
db.session.add(template)
return template

9
tests/app/dao/test_templates_dao.py
View File

@@ -99,7 +99,7 @@ def test_get_all_templates_for_service(notify_db, notify_db_session, service_fac
assert len(dao_get_all_templates_for_service(service_2.id)) == 2
def test_get_all_templates_for_service_in_created_order(notify_db, notify_db_session, sample_service):
def test_get_all_templates_for_service_shows_newest_created_first(notify_db, notify_db_session, sample_service):
template_1 = create_sample_template(
notify_db,
notify_db_session,
@@ -126,13 +126,14 @@ def test_get_all_templates_for_service_in_created_order(notify_db, notify_db_ses
)
assert Template.query.count() == 3
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 1'
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 3'
assert dao_get_all_templates_for_service(sample_service.id)[1].name == 'Sample Template 2'
assert dao_get_all_templates_for_service(sample_service.id)[2].name == 'Sample Template 3'
assert dao_get_all_templates_for_service(sample_service.id)[2].name == 'Sample Template 1'
template_2.name = 'Sample Template 2 (updated)'
dao_update_template(template_2)
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 2 (updated)'
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 3'
assert dao_get_all_templates_for_service(sample_service.id)[1].name == 'Sample Template 2 (updated)'
def test_get_all_returns_empty_list_if_no_templates(sample_service):

24
tests/app/service/test_rest.py
View File

@@ -640,7 +640,14 @@ def test_add_existing_user_to_another_service_with_all_permissions(notify_api,
# they must exist in db first
save_model_user(user_to_add)
data = {'permissions': ['send_messages', 'manage_service', 'manage_api_keys']}
data = [{"permission": "send_emails"},
{"permission": "send_letters"},
{"permission": "send_texts"},
{"permission": "manage_users"},
{"permission": "manage_settings"},
{"permission": "manage_api_keys"},
{"permission": "manage_templates"},
{"permission": "view_activity"}]
auth_header = create_authorization_header()
@@ -672,7 +679,7 @@ def test_add_existing_user_to_another_service_with_all_permissions(notify_api,
json_resp = json.loads(resp.get_data(as_text=True))
permissions = json_resp['data']['permissions'][str(sample_service.id)]
expected_permissions = ['send_texts', 'send_emails', 'send_letters', 'manage_users',
'manage_settings', 'manage_templates', 'manage_api_keys']
'manage_settings', 'manage_templates', 'manage_api_keys', 'view_activity']
assert sorted(expected_permissions) == sorted(permissions)
@@ -693,7 +700,10 @@ def test_add_existing_user_to_another_service_with_send_permissions(notify_api,
)
save_model_user(user_to_add)
data = {'permissions': ['send_messages']}
data = [{"permission": "send_emails"},
{"permission": "send_letters"},
{"permission": "send_texts"}]
auth_header = create_authorization_header()
resp = client.post(
@@ -734,7 +744,10 @@ def test_add_existing_user_to_another_service_with_manage_permissions(notify_api
)
save_model_user(user_to_add)
data = {'permissions': ['manage_service']}
data = [{"permission": "manage_users"},
{"permission": "manage_settings"},
{"permission": "manage_templates"}]
auth_header = create_authorization_header()
resp = client.post(
@@ -775,7 +788,8 @@ def test_add_existing_user_to_another_service_with_manage_api_keys(notify_api,
)
save_model_user(user_to_add)
data = {'permissions': ['manage_api_keys']}
data = [{"permission": "manage_api_keys"}]
auth_header = create_authorization_header()
resp = client.post(

4
tests/app/template/test_rest.py
View File

@@ -250,10 +250,10 @@ def test_should_be_able_to_get_all_templates_for_a_service(notify_api, sample_us
assert response.status_code == 200
update_json_resp = json.loads(response.get_data(as_text=True))
assert update_json_resp['data'][0]['name'] == 'my template 1'
assert update_json_resp['data'][0]['name'] == 'my template 2'
assert update_json_resp['data'][0]['version'] == 1
assert update_json_resp['data'][0]['created_at']
assert update_json_resp['data'][1]['name'] == 'my template 2'
assert update_json_resp['data'][1]['name'] == 'my template 1'
assert update_json_resp['data'][1]['version'] == 1
assert update_json_resp['data'][1]['created_at']

67
tests/app/user/test_rest_verify.py
View File

@@ -6,8 +6,7 @@ from datetime import (
timedelta
)
from flask import url_for
from flask import url_for, current_app
from app.models import (
VerifyCode,
User
@@ -215,45 +214,81 @@ def test_user_verify_password_missing_password(notify_api,
assert 'Required field missing data' in json_resp['message']['password']
@freeze_time("2016-01-01 11:09:00.061258")
def test_send_user_sms_code(notify_api,
sample_sms_code,
mock_celery_send_sms_code,
mock_encryption):
sample_user,
sms_code_template,
mocker):
"""
Tests POST endpoint /user/<user_id>/sms-code
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
data = json.dumps({})
auth_header = create_authorization_header()
mocked = mocker.patch('app.user.rest.create_secret_code', return_value='11111')
mocker.patch('app.celery.tasks.send_sms.apply_async')
mocker.patch('uuid.uuid4', return_value='some_uuid') # for the notification id
resp = client.post(
url_for('user.send_user_sms_code', user_id=sample_sms_code.user.id),
url_for('user.send_user_sms_code', user_id=sample_user.id),
data=data,
headers=[('Content-Type', 'application/json'), auth_header])
assert resp.status_code == 204
app.celery.tasks.send_sms_code.apply_async.assert_called_once_with(['something_encrypted'],
queue='sms-code')
assert mocked.call_count == 1
encrypted = encryption.encrypt({'template': current_app.config['SMS_CODE_TEMPLATE_ID'],
'template_version': 1,
'to': sample_user.mobile_number,
'personalisation': {
'verify_code': '11111'
}
})
app.celery.tasks.send_sms.apply_async.assert_called_once_with(
([current_app.config['NOTIFY_SERVICE_ID'],
"some_uuid",
encrypted,
"2016-01-01T11:09:00.061258"]),
queue="sms-code"
)
@freeze_time("2016-01-01 11:09:00.061258")
def test_send_user_code_for_sms_with_optional_to_field(notify_api,
sample_sms_code,
mock_secret_code,
mock_celery_send_sms_code):
sample_user,
sms_code_template,
mock_encryption,
mocker):
"""
Tests POST endpoint '/<user_id>/code' successful sms with optional to field
"""
Tests POST endpoint '/<user_id>/code' successful sms with optional to field
"""
with notify_api.test_request_context():
with notify_api.test_client() as client:
mocked = mocker.patch('app.user.rest.create_secret_code', return_value='11111')
mocker.patch('uuid.uuid4', return_value='some_uuid') # for the notification id
mocker.patch('app.celery.tasks.send_sms.apply_async')
data = json.dumps({'to': '+441119876757'})
auth_header = create_authorization_header()
resp = client.post(
url_for('user.send_user_sms_code', user_id=sample_sms_code.user.id),
url_for('user.send_user_sms_code', user_id=sample_user.id),
data=data,
headers=[('Content-Type', 'application/json'), auth_header])
assert resp.status_code == 204
encrypted = encryption.encrypt({'to': '+441119876757', 'secret_code': '11111'})
app.celery.tasks.send_sms_code.apply_async.assert_called_once_with([encrypted], queue='sms-code')
encrypted = encryption.encrypt({'template': current_app.config['SMS_CODE_TEMPLATE_ID'],
'template_version': 1,
'to': '+441119876757',
'personalisation': {
'verify_code': '11111'
}
})
assert mocked.call_count == 1
app.celery.tasks.send_sms.apply_async.assert_called_once_with(
([current_app.config['NOTIFY_SERVICE_ID'],
"some_uuid",
encrypted,
"2016-01-01T11:09:00.061258"]),
queue="sms-code"
)
def test_send_sms_code_returns_404_for_bad_input_data(notify_api, notify_db, notify_db_session):