From 5d806c2437642f72bc4ff030ba37a2a20d3967bb Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Tue, 6 Nov 2018 14:40:40 +0000 Subject: [PATCH] Adjust tests to new way of querying for notification stats --- app/service/rest.py | 1 - tests/app/service/test_rest.py | 4 ++-- tests/app/service/test_statistics_rest.py | 7 +++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/service/rest.py b/app/service/rest.py index ddb70dae5..ce0b37048 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -48,7 +48,6 @@ from app.dao.services_dao import ( dao_fetch_all_services_by_user, dao_fetch_monthly_historical_usage_by_template_for_service, dao_fetch_service_by_id, - dao_fetch_stats_for_service, dao_fetch_todays_stats_for_service, dao_fetch_todays_stats_for_all_services, dao_resume_service, diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 7dfaad89a..13b0cb422 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -34,6 +34,7 @@ from tests.app.conftest import ( sample_notification_with_job ) from tests.app.db import ( + create_ft_notification_status, create_service, create_service_with_inbound_number, create_template, @@ -1469,8 +1470,7 @@ def test_set_sms_prefixing_for_service_cant_be_none( ], ids=['seven_days', 'today']) def test_get_detailed_service(notify_db, notify_db_session, notify_api, sample_service, today_only, stats): with notify_api.test_request_context(), notify_api.test_client() as client: - with freeze_time('2000-01-01T12:00:00'): - create_sample_notification(notify_db, notify_db_session, status='delivered') + create_ft_notification_status(date(2000, 1, 1), 'sms', sample_service, count=1) with freeze_time('2000-01-02T12:00:00'): create_sample_notification(notify_db, notify_db_session, status='created') resp = client.get( diff --git a/tests/app/service/test_statistics_rest.py b/tests/app/service/test_statistics_rest.py index 4fe36a62a..5b9719637 100644 --- a/tests/app/service/test_statistics_rest.py +++ b/tests/app/service/test_statistics_rest.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime +from datetime import datetime, date import pytest from freezegun import freeze_time @@ -133,9 +133,8 @@ def test_get_template_usage_by_month_returns_two_templates(admin_request, sample (False, {'requested': 2, 'delivered': 1, 'failed': 0}), (True, {'requested': 1, 'delivered': 0, 'failed': 0}) ], ids=['seven_days', 'today']) -def test_get_service_notification_statistics(admin_request, sample_template, today_only, stats): - with freeze_time('2000-01-01T12:00:00'): - create_notification(sample_template, status='delivered') +def test_get_service_notification_statistics(admin_request, sample_service, sample_template, today_only, stats): + create_ft_notification_status(date(2000, 1, 1), 'sms', sample_service, count=1) with freeze_time('2000-01-02T12:00:00'): create_notification(sample_template, status='created') resp = admin_request.get(