mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-23 17:01:35 -05:00
Working tests and provider stats table.
Fix for tests and import error. Added tests and updated for code review comments.
This commit is contained in:
@@ -11,12 +11,13 @@ from app.models import Template
|
||||
import pytest
|
||||
|
||||
|
||||
def test_create_template(sample_service):
|
||||
def test_create_template(sample_service, sample_user):
|
||||
data = {
|
||||
'name': 'Sample Template',
|
||||
'template_type': "sms",
|
||||
'content': "Template content",
|
||||
'service': sample_service
|
||||
'service': sample_service,
|
||||
'created_by': sample_user
|
||||
}
|
||||
template = Template(**data)
|
||||
dao_create_template(template)
|
||||
@@ -26,13 +27,14 @@ def test_create_template(sample_service):
|
||||
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template'
|
||||
|
||||
|
||||
def test_create_email_template(sample_service):
|
||||
def test_create_email_template(sample_service, sample_user):
|
||||
data = {
|
||||
'name': 'Sample Template',
|
||||
'template_type': "email",
|
||||
'subject': "subject",
|
||||
'content': "Template content",
|
||||
'service': sample_service
|
||||
'service': sample_service,
|
||||
'created_by': sample_user
|
||||
}
|
||||
template = Template(**data)
|
||||
dao_create_template(template)
|
||||
@@ -42,12 +44,13 @@ def test_create_email_template(sample_service):
|
||||
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template'
|
||||
|
||||
|
||||
def test_update_template(sample_service):
|
||||
def test_update_template(sample_service, sample_user):
|
||||
data = {
|
||||
'name': 'Sample Template',
|
||||
'template_type': "sms",
|
||||
'content': "Template content",
|
||||
'service': sample_service
|
||||
'service': sample_service,
|
||||
'created_by': sample_user
|
||||
}
|
||||
template = Template(**data)
|
||||
dao_create_template(template)
|
||||
@@ -59,7 +62,7 @@ def test_update_template(sample_service):
|
||||
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'new name'
|
||||
|
||||
|
||||
def test_get_all_templates_for_service(service_factory):
|
||||
def test_get_all_templates_for_service(notify_db, 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')
|
||||
|
||||
@@ -67,55 +70,61 @@ def test_get_all_templates_for_service(service_factory):
|
||||
assert len(dao_get_all_templates_for_service(service_1.id)) == 1
|
||||
assert len(dao_get_all_templates_for_service(service_2.id)) == 1
|
||||
|
||||
template_1 = Template(
|
||||
name='Sample Template 1',
|
||||
template_1 = create_sample_template(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template_name='Sample Template 1',
|
||||
template_type="sms",
|
||||
content="Template content",
|
||||
service=service_1
|
||||
)
|
||||
template_2 = Template(
|
||||
name='Sample Template 2',
|
||||
template_2 = create_sample_template(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template_name='Sample Template 2',
|
||||
template_type="sms",
|
||||
content="Template content",
|
||||
service=service_1
|
||||
)
|
||||
template_3 = Template(
|
||||
name='Sample Template 3',
|
||||
template_3 = create_sample_template(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template_name='Sample Template 3',
|
||||
template_type="sms",
|
||||
content="Template content",
|
||||
service=service_2
|
||||
)
|
||||
dao_create_template(template_1)
|
||||
dao_create_template(template_2)
|
||||
dao_create_template(template_3)
|
||||
|
||||
assert Template.query.count() == 5
|
||||
assert len(dao_get_all_templates_for_service(service_1.id)) == 3
|
||||
assert len(dao_get_all_templates_for_service(service_2.id)) == 2
|
||||
|
||||
|
||||
def test_get_all_templates_for_service_in_created_order(sample_service):
|
||||
template_1 = Template(
|
||||
name='Sample Template 1',
|
||||
def test_get_all_templates_for_service_in_created_order(notify_db, notify_db_session, sample_service):
|
||||
template_1 = create_sample_template(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template_name='Sample Template 1',
|
||||
template_type="sms",
|
||||
content="Template content",
|
||||
service=sample_service
|
||||
)
|
||||
template_2 = Template(
|
||||
name='Sample Template 2',
|
||||
template_2 = create_sample_template(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template_name='Sample Template 2',
|
||||
template_type="sms",
|
||||
content="Template content",
|
||||
service=sample_service
|
||||
)
|
||||
template_3 = Template(
|
||||
name='Sample Template 3',
|
||||
template_3 = create_sample_template(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
template_name='Sample Template 3',
|
||||
template_type="sms",
|
||||
content="Template content",
|
||||
service=sample_service
|
||||
)
|
||||
dao_create_template(template_1)
|
||||
dao_create_template(template_2)
|
||||
dao_create_template(template_3)
|
||||
|
||||
assert Template.query.count() == 3
|
||||
assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 1'
|
||||
@@ -148,3 +157,64 @@ def test_get_template_by_id_and_service_returns_none_if_no_template(sample_servi
|
||||
with pytest.raises(NoResultFound) as e:
|
||||
dao_get_template_by_id_and_service_id(template_id=fake_uuid, service_id=sample_service.id)
|
||||
assert 'No row was found for one' in str(e.value)
|
||||
|
||||
|
||||
def test_create_template_creates_a_history_record_with_current_data(sample_service, sample_user):
|
||||
assert Template.query.count() == 0
|
||||
assert Template.get_history_model().query.count() == 0
|
||||
data = {
|
||||
'name': 'Sample Template',
|
||||
'template_type': "email",
|
||||
'subject': "subject",
|
||||
'content': "Template content",
|
||||
'service': sample_service,
|
||||
'created_by': sample_user
|
||||
}
|
||||
template = Template(**data)
|
||||
dao_create_template(template)
|
||||
|
||||
assert Template.query.count() == 1
|
||||
|
||||
template_from_db = Template.query.first()
|
||||
template_history = Template.get_history_model().query.first()
|
||||
|
||||
assert template_from_db.id == template_history.id
|
||||
assert template_from_db.name == template_history.name
|
||||
assert template_from_db.version == 1
|
||||
assert template_from_db.version == template_history.version
|
||||
assert sample_user.id == template_history.created_by_id
|
||||
assert template_from_db.created_by.id == template_history.created_by_id
|
||||
|
||||
|
||||
def test_update_template_creates_a_history_record_with_current_data(sample_service, sample_user):
|
||||
assert Template.query.count() == 0
|
||||
assert Template.get_history_model().query.count() == 0
|
||||
data = {
|
||||
'name': 'Sample Template',
|
||||
'template_type': "email",
|
||||
'subject': "subject",
|
||||
'content': "Template content",
|
||||
'service': sample_service,
|
||||
'created_by': sample_user
|
||||
}
|
||||
template = Template(**data)
|
||||
dao_create_template(template)
|
||||
|
||||
created = dao_get_all_templates_for_service(sample_service.id)[0]
|
||||
assert created.name == 'Sample Template'
|
||||
assert Template.query.count() == 1
|
||||
assert Template.query.first().version == 1
|
||||
assert Template.get_history_model().query.count() == 1
|
||||
|
||||
created.name = 'new name'
|
||||
dao_update_template(created)
|
||||
|
||||
assert Template.query.count() == 1
|
||||
assert Template.get_history_model().query.count() == 2
|
||||
|
||||
template_from_db = Template.query.first()
|
||||
|
||||
assert template_from_db.version == 2
|
||||
|
||||
assert Template.get_history_model().query.filter_by(name='Sample Template').one().version == 1
|
||||
assert Template.get_history_model().query.filter_by(name='new name').one().version == 2
|
||||
|
||||
Reference in New Issue
Block a user