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

Fixing tests as stats update now don't update reference

Browse Source
This commit is contained in:
Martyn Inglis
2016-06-02 10:00:27 +01:00
parent 754ccbe9af
commit c6c534365e
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/app/dao/test_notification_dao.py
View File

@@ -36,15 +36,6 @@ from notifications_utils.template import get_sms_fragment_count
from tests.app.conftest import (sample_notification) from tests.app.conftest import (sample_notification)
def test_should_by_able_to_update_reference_by_notification_id(sample_notification, mmg_provider):
assert not Notification.query.get(sample_notification.id).reference
update_provider_stats(
sample_notification.id,
'sms',
mmg_provider.identifier,
reference='reference')
assert Notification.query.get(sample_notification.id).reference == 'reference'
def test_should_by_able_to_update_status_by_reference(sample_email_template, ses_provider): def test_should_by_able_to_update_status_by_reference(sample_email_template, ses_provider):
data = _notification_json(sample_email_template) data = _notification_json(sample_email_template)
@@ -56,11 +47,9 @@ def test_should_by_able_to_update_status_by_reference(sample_email_template, ses
ses_provider.identifier) ses_provider.identifier)
assert Notification.query.get(notification.id).status == "sending" assert Notification.query.get(notification.id).status == "sending"
update_provider_stats( notification.reference = 'reference'
notification.id, dao_update_notification(notification)
'email',
ses_provider.identifier,
reference="reference")
update_notification_status_by_reference('reference', 'delivered', 'delivered') update_notification_status_by_reference('reference', 'delivered', 'delivered')
assert Notification.query.get(notification.id).status == 'delivered' assert Notification.query.get(notification.id).status == 'delivered'
_assert_notification_stats(notification.service_id, emails_delivered=1, emails_requested=1, emails_failed=0) _assert_notification_stats(notification.service_id, emails_delivered=1, emails_requested=1, emails_failed=0)
@@ -150,8 +139,9 @@ def test_should_not_update_status_one_notification_status_is_delivered(sample_em
update_provider_stats( update_provider_stats(
notification.id, notification.id,
'email', 'email',
ses_provider.identifier, ses_provider.identifier)
reference='reference') notification.reference = 'reference'
dao_update_notification(notification)
update_notification_status_by_reference('reference', 'delivered', 'delivered') update_notification_status_by_reference('reference', 'delivered', 'delivered')
assert Notification.query.get(notification.id).status == 'delivered' assert Notification.query.get(notification.id).status == 'delivered'
@@ -177,8 +167,9 @@ def test_should_be_able_to_record_statistics_failure_for_email(sample_email_temp
update_provider_stats( update_provider_stats(
notification.id, notification.id,
'email', 'email',
ses_provider.identifier, ses_provider.identifier)
reference='reference') notification.reference = 'reference'
dao_update_notification(notification)
count = update_notification_status_by_reference('reference', 'failed', 'failure') count = update_notification_status_by_reference('reference', 'failed', 'failure')
assert count == 1 assert count == 1
assert Notification.query.get(notification.id).status == 'failed' assert Notification.query.get(notification.id).status == 'failed'

8
tests/app/dao/test_notifications_dao_provider_statistics.py
View File

@@ -29,7 +29,7 @@ def test_should_update_provider_statistics_email(notify_db,
notify_db, notify_db,
notify_db_session, notify_db_session,
template=sample_email_template) template=sample_email_template)
update_provider_stats(n1.id, 'email', ses_provider.identifier, reference="reference") update_provider_stats(n1.id, 'email', ses_provider.identifier)
provider_stats = get_provider_statistics( provider_stats = get_provider_statistics(
sample_email_template.service, sample_email_template.service,
providers=[ses_provider.identifier]).one() providers=[ses_provider.identifier]).one()
@@ -76,19 +76,19 @@ def test_should_update_provider_statistics_email_multi(notify_db,
notify_db_session, notify_db_session,
template=sample_email_template, template=sample_email_template,
provider_name=ses_provider.identifier) provider_name=ses_provider.identifier)
update_provider_stats(n1.id, 'email', ses_provider.identifier, reference="reference") update_provider_stats(n1.id, 'email', ses_provider.identifier)
n2 = create_sample_notification( n2 = create_sample_notification(
notify_db, notify_db,
notify_db_session, notify_db_session,
template=sample_email_template, template=sample_email_template,
provider_name=ses_provider.identifier) provider_name=ses_provider.identifier)
update_provider_stats(n2.id, 'email', ses_provider.identifier, reference="reference") update_provider_stats(n2.id, 'email', ses_provider.identifier)
n3 = create_sample_notification( n3 = create_sample_notification(
notify_db, notify_db,
notify_db_session, notify_db_session,
template=sample_email_template, template=sample_email_template,
provider_name=ses_provider.identifier) provider_name=ses_provider.identifier)
update_provider_stats(n3.id, 'email', ses_provider.identifier, reference="reference") update_provider_stats(n3.id, 'email', ses_provider.identifier)
provider_stats = get_provider_statistics( provider_stats = get_provider_statistics(
sample_email_template.service, sample_email_template.service,
providers=[ses_provider.identifier]).one() providers=[ses_provider.identifier]).one()