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

- Adding test where post_notification can't send to a member outside of the team or whitelist.

Browse Source 
- Updating some tests to be pytest4 compliant.
This commit is contained in:
Rebecca Law
2019-06-11 16:45:35 +01:00
parent d19dbe5b61
commit 1f9aade749
5 changed files with 102 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/app/conftest.py
View File

@@ -59,6 +59,7 @@ from tests.app.db import (
create_inbound_number,
create_letter_contact,
create_invited_org_user,
create_job
)
@@ -502,13 +503,14 @@ def sample_notification_with_job(
api_key=None,
key_type=KEY_TYPE_NORMAL
):
if not service:
service = create_service()
if not template:
template = create_template(service=service)
if job is None:
job = sample_job(notify_db, notify_db_session, service=service, template=template)
return sample_notification(
notify_db,
notify_db_session,
service,
template,
job = create_job(template=template)
return create_notification(
template=template,
job=job,
job_row_number=job_row_number if job_row_number is not None else None,
to_field=to_field,

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

@@ -20,7 +20,6 @@ from app.models import (
TemplateRedacted
)
from tests.app.conftest import sample_template as create_sample_template
from tests.app.db import create_template, create_letter_contact
@@ -222,7 +221,7 @@ def test_redact_template(sample_template):
assert redacted.updated_by_id == sample_template.created_by_id
def test_get_all_templates_for_service(notify_db, notify_db_session, service_factory):
def test_get_all_templates_for_service(notify_db_session, service_factory):
service_1 = service_factory.get('service 1', email_from='service.1')
service_2 = service_factory.get('service 2', email_from='service.2')
@@ -230,29 +229,23 @@ def test_get_all_templates_for_service(notify_db, notify_db_session, service_fac
assert len(dao_get_all_templates_for_service(service_1.id)) == 1
assert len(dao_get_all_templates_for_service(service_2.id)) == 1
create_sample_template(
notify_db,
notify_db_session,
create_template(
service=service_1,
template_name='Sample Template 1',
template_type="sms",
content="Template content",
service=service_1
)
create_sample_template(
notify_db,
notify_db_session,
create_template(
service=service_1,
template_name='Sample Template 2',
template_type="sms",
content="Template content",
service=service_1
)
create_sample_template(
notify_db,
notify_db_session,
create_template(
service=service_2,
template_name='Sample Template 3',
template_type="sms",
content="Template content",
service=service_2
)
assert Template.query.count() == 5
@@ -260,26 +253,20 @@ 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_is_alphabetised(notify_db, notify_db_session, sample_service):
create_sample_template(
notify_db,
notify_db_session,
def test_get_all_templates_for_service_is_alphabetised(notify_db_session, sample_service):
create_template(
template_name='Sample Template 1',
template_type="sms",
content="Template content",
service=sample_service
)
template_2 = create_sample_template(
notify_db,
notify_db_session,
template_2 = create_template(
template_name='Sample Template 2',
template_type="sms",
content="Template content",
service=sample_service
)
create_sample_template(
notify_db,
notify_db_session,
create_template(
template_name='Sample Template 3',
template_type="sms",
content="Template content",
@@ -302,17 +289,13 @@ def test_get_all_returns_empty_list_if_no_templates(sample_service):
assert len(dao_get_all_templates_for_service(sample_service.id)) == 0
def test_get_all_templates_ignores_archived_templates(notify_db, notify_db_session, sample_service):
normal_template = create_sample_template(
notify_db,
notify_db_session,
def test_get_all_templates_ignores_archived_templates(notify_db_session, sample_service):
normal_template = create_template(
template_name='Normal Template',
service=sample_service,
archived=False
)
archived_template = create_sample_template(
notify_db,
notify_db_session,
archived_template = create_template(
template_name='Archived Template',
service=sample_service
)
@@ -326,18 +309,14 @@ def test_get_all_templates_ignores_archived_templates(notify_db, notify_db_sessi
assert templates[0] == normal_template
def test_get_all_templates_ignores_hidden_templates(notify_db, notify_db_session, sample_service):
normal_template = create_sample_template(
notify_db,
notify_db_session,
def test_get_all_templates_ignores_hidden_templates(notify_db_session, sample_service):
normal_template = create_template(
template_name='Normal Template',
service=sample_service,
archived=False
)
create_sample_template(
notify_db,
notify_db_session,
create_template(
template_name='Hidden Template',
hidden=True,
service=sample_service
@@ -349,10 +328,8 @@ def test_get_all_templates_ignores_hidden_templates(notify_db, notify_db_session
assert templates[0] == normal_template
def test_get_template_by_id_and_service(notify_db, notify_db_session, sample_service):
sample_template = create_sample_template(
notify_db,
notify_db_session,
def test_get_template_by_id_and_service(notify_db_session, sample_service):
sample_template = create_template(
template_name='Test Template',
service=sample_service)
template = dao_get_template_by_id_and_service_id(
@@ -364,10 +341,8 @@ def test_get_template_by_id_and_service(notify_db, notify_db_session, sample_ser
assert not template.redact_personalisation
def test_get_template_by_id_and_service_returns_none_for_hidden_templates(notify_db, notify_db_session, sample_service):
sample_template = create_sample_template(
notify_db,
notify_db_session,
def test_get_template_by_id_and_service_returns_none_for_hidden_templates(notify_db_session, sample_service):
sample_template = create_template(
template_name='Test Template',
hidden=True,
service=sample_service
@@ -380,10 +355,8 @@ def test_get_template_by_id_and_service_returns_none_for_hidden_templates(notify
)
def test_get_template_version_returns_none_for_hidden_templates(notify_db, notify_db_session, sample_service):
sample_template = create_sample_template(
notify_db,
notify_db_session,
def test_get_template_version_returns_none_for_hidden_templates(notify_db_session, sample_service):
sample_template = create_template(
template_name='Test Template',
hidden=True,
service=sample_service
@@ -505,9 +478,7 @@ def test_get_template_versions(sample_template):
def test_get_template_versions_is_empty_for_hidden_templates(notify_db, notify_db_session, sample_service):
sample_template = create_sample_template(
notify_db,
notify_db_session,
sample_template = create_template(
template_name='Test Template',
hidden=True,
service=sample_service

4
tests/app/db.py
View File

@@ -176,6 +176,7 @@ def create_template(
archived=False,
folder=None,
postage=None,
process_type='normal',
):
data = {
'name': template_name or '{} Template Name'.format(template_type),
@@ -185,7 +186,8 @@ def create_template(
'created_by': service.created_by,
'reply_to': reply_to,
'hidden': hidden,
'folder': folder
'folder': folder,
'process_type': process_type
}
if template_type == LETTER_TYPE:
data["postage"] = postage or "second"

6
tests/app/test_model.py
View File

@@ -181,9 +181,9 @@ def test_notification_subject_fills_in_placeholders_for_email(sample_email_templ
assert noti.subject == 'hello'
def test_notification_subject_fills_in_placeholders_for_letter(sample_letter_template):
noti = create_notification(sample_letter_template, personalisation={'name': 'hello'})
noti.template.subject = '((name))'
def test_notification_subject_fills_in_placeholders_for_letter(sample_service):
template = create_template(service=sample_service, template_type='email', subject='((name))')
noti = create_notification(template=template, personalisation={'name': 'hello'})
assert noti.subject == 'hello'

108
tests/app/v2/notifications/test_post_notifications.py
View File

@@ -10,7 +10,8 @@ from app.models import (
NOTIFICATION_CREATED,
SCHEDULE_NOTIFICATIONS,
SMS_TYPE,
UPLOAD_DOCUMENT
UPLOAD_DOCUMENT,
INTERNATIONAL_SMS_TYPE
)
from flask import json, current_app
@@ -19,19 +20,14 @@ from app.schema_validation import validate
from app.v2.errors import RateLimitError
from app.v2.notifications.notification_schemas import post_sms_response, post_email_response
from tests import create_authorization_header
from tests.app.conftest import (
sample_template as create_sample_template,
sample_service,
sample_template_without_email_permission,
sample_template_without_sms_permission
)
from tests.app.db import (
create_service,
create_template,
create_reply_to_email,
create_service_sms_sender,
create_service_with_inbound_number
create_service_with_inbound_number,
create_api_key
)
@@ -375,17 +371,18 @@ def test_should_not_persist_or_send_notification_if_simulated_recipient(
@pytest.mark.parametrize("notification_type, key_send_to, send_to",
[("sms", "phone_number", "07700 900 855"),
("email", "email_address", "sample@email.com")])
def test_send_notification_uses_priority_queue_when_template_is_marked_as_priority(client, notify_db,
notify_db_session,
mocker,
notification_type,
key_send_to,
send_to):
def test_send_notification_uses_priority_queue_when_template_is_marked_as_priority(
client,
sample_service,
mocker,
notification_type,
key_send_to,
send_to
):
mocker.patch('app.celery.provider_tasks.deliver_{}.apply_async'.format(notification_type))
sample = create_sample_template(
notify_db,
notify_db_session,
sample = create_template(
service=sample_service,
template_type=notification_type,
process_type='priority'
)
@@ -415,18 +412,13 @@ def test_send_notification_uses_priority_queue_when_template_is_marked_as_priori
)
def test_returns_a_429_limit_exceeded_if_rate_limit_exceeded(
client,
notify_db,
notify_db_session,
sample_service,
mocker,
notification_type,
key_send_to,
send_to
):
sample = create_sample_template(
notify_db,
notify_db_session,
template_type=notification_type
)
sample = create_template(service=sample_service, template_type=notification_type)
persist_mock = mocker.patch('app.v2.notifications.post_notifications.persist_notification')
deliver_mock = mocker.patch('app.v2.notifications.post_notifications.send_notification_to_queue')
mocker.patch(
@@ -459,11 +451,10 @@ def test_returns_a_429_limit_exceeded_if_rate_limit_exceeded(
def test_post_sms_notification_returns_400_if_not_allowed_to_send_int_sms(
client,
notify_db,
notify_db_session,
):
service = sample_service(notify_db, notify_db_session, permissions=[SMS_TYPE])
template = create_sample_template(notify_db, notify_db_session, service=service)
service = create_service(service_permissions=[SMS_TYPE])
template = create_template(service=service)
data = {
'phone_number': '20-12-1234-1234',
@@ -511,12 +502,14 @@ def test_post_sms_notification_with_archived_reply_to_id_returns_400(client, sam
assert 'BadRequestError' in resp_json['errors'][0]['error']
@pytest.mark.parametrize('recipient,label,template_factory,expected_error', [
('07700 900000', 'phone_number', sample_template_without_sms_permission, 'text messages'),
('someone@test.com', 'email_address', sample_template_without_email_permission, 'emails')])
@pytest.mark.parametrize('recipient,label,permission_type, notification_type,expected_error', [
('07700 900000', 'phone_number', 'email', 'sms', 'text messages'),
('someone@test.com', 'email_address', 'sms', 'email', 'emails')])
def test_post_sms_notification_returns_400_if_not_allowed_to_send_notification(
client, template_factory, recipient, label, expected_error, notify_db, notify_db_session):
sample_template_without_permission = template_factory(notify_db, notify_db_session)
notify_db_session, client, recipient, label, permission_type, notification_type, expected_error
):
service = create_service(service_permissions=[permission_type])
sample_template_without_permission = create_template(service=service, template_type=notification_type)
data = {
label: recipient,
'template_id': sample_template_without_permission.id
@@ -538,6 +531,33 @@ def test_post_sms_notification_returns_400_if_not_allowed_to_send_notification(
]
@pytest.mark.parametrize('restricted', [True, False])
def test_post_sms_notification_returns_400_if_number_not_whitelisted(
notify_db_session, client, restricted
):
service = create_service(restricted=restricted, service_permissions=[SMS_TYPE, INTERNATIONAL_SMS_TYPE])
template = create_template(service=service)
create_api_key(service=service, key_type='team')
data = {
"phone_number": '+327700900855',
"template_id": template.id,
}
auth_header = create_authorization_header(service_id=service.id, key_type='team')
response = client.post(
path='/v2/notifications/sms',
data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header])
assert response.status_code == 400
error_json = json.loads(response.get_data(as_text=True))
assert error_json['status_code'] == 400
assert error_json['errors'] == [
{"error": "BadRequestError", "message": 'Can’t send to this recipient using a team-only API key'}
]
def test_post_sms_notification_returns_201_if_allowed_to_send_int_sms(
sample_service,
sample_template,
@@ -750,10 +770,10 @@ def test_post_email_notification_with_archived_reply_to_id_returns_400(client, s
assert 'BadRequestError' in resp_json['errors'][0]['error']
def test_post_notification_with_document_upload(client, notify_db, notify_db_session, mocker):
service = sample_service(notify_db, notify_db_session, permissions=[EMAIL_TYPE, UPLOAD_DOCUMENT])
template = create_sample_template(
notify_db, notify_db_session, service=service,
def test_post_notification_with_document_upload(client, notify_db_session, mocker):
service = create_service(service_permissions=[EMAIL_TYPE, UPLOAD_DOCUMENT])
template = create_template(
service=service,
template_type='email',
content="Document: ((document))"
)
@@ -785,10 +805,10 @@ def test_post_notification_with_document_upload(client, notify_db, notify_db_ses
assert resp_json['content']['body'] == 'Document: https://document-url/'
def test_post_notification_with_document_upload_simulated(client, notify_db, notify_db_session, mocker):
service = sample_service(notify_db, notify_db_session, permissions=[EMAIL_TYPE, UPLOAD_DOCUMENT])
template = create_sample_template(
notify_db, notify_db_session, service=service,
def test_post_notification_with_document_upload_simulated(client, notify_db_session, mocker):
service = create_service(service_permissions=[EMAIL_TYPE, UPLOAD_DOCUMENT])
template = create_template(
service=service,
template_type='email',
content="Document: ((document))"
)
@@ -816,10 +836,10 @@ def test_post_notification_with_document_upload_simulated(client, notify_db, not
assert resp_json['content']['body'] == 'Document: https://document-url/test-document'
def test_post_notification_without_document_upload_permission(client, notify_db, notify_db_session, mocker):
service = sample_service(notify_db, notify_db_session, permissions=[EMAIL_TYPE])
template = create_sample_template(
notify_db, notify_db_session, service=service,
def test_post_notification_without_document_upload_permission(client, notify_db_session, mocker):
service = create_service(service_permissions=[EMAIL_TYPE])
template = create_template(
service=service,
template_type='email',
content="Document: ((document))"
)