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

Remove insert to NotificationHistory

Browse Source 
Fix all test failures
This commit is contained in:
Rebecca Law
2019-05-30 10:37:57 +01:00
parent b0baf10229
commit c23ae15f32
12 changed files with 163 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/app/celery/test_ftp_update_tasks.py
View File

@@ -7,7 +7,6 @@ from flask import current_app
from app.exceptions import DVLAException, NotificationTechnicalFailureException
from app.models import (
Notification,
NotificationHistory,
NOTIFICATION_CREATED,
NOTIFICATION_DELIVERED,
@@ -28,7 +27,7 @@ from app.celery.tasks import (
)
from app.dao.daily_sorted_letter_dao import dao_get_daily_sorted_letter_by_billing_day
from tests.app.db import create_notification, create_service_callback_api
from tests.app.db import create_notification, create_service_callback_api, create_notification_history
from tests.conftest import set_config
@@ -56,9 +55,8 @@ def test_update_letter_notification_statuses_when_notification_does_not_exist_up
):
valid_file = 'ref-foo|Sent|1|Unsorted'
mocker.patch('app.celery.tasks.s3.get_s3_file', return_value=valid_file)
notification = create_notification(sample_letter_template, reference='ref-foo', status=NOTIFICATION_SENDING,
billable_units=1)
Notification.query.filter_by(id=notification.id).delete()
notification = create_notification_history(sample_letter_template, reference='ref-foo', status=NOTIFICATION_SENDING,
billable_units=1)
update_letter_notifications_statuses(filename="NOTIFY-20170823160812-RSP.TXT")

8
tests/app/celery/test_tasks.py
View File

@@ -14,7 +14,6 @@ from notifications_utils.columns import Row
from app import (
DATETIME_FORMAT,
db,
encryption
)
from app.celery import provider_tasks
@@ -60,6 +59,7 @@ from tests.app.db import (
create_user,
create_reply_to_email,
create_service_with_defined_sms_sender,
create_notification_history
)
from tests.conftest import set_config_values
@@ -1601,11 +1601,9 @@ def test_process_returned_letters_list(sample_letter_template):
def test_process_returned_letters_list_updates_history_if_notification_is_already_purged(
sample_letter_template
):
create_notification(sample_letter_template, reference='ref1')
create_notification(sample_letter_template, reference='ref2')
create_notification_history(sample_letter_template, reference='ref1')
create_notification_history(sample_letter_template, reference='ref2')
Notification.query.delete()
db.session.commit()
process_returned_letters_list(['ref1', 'ref2', 'unknown-ref'])
notifications = NotificationHistory.query.all()