From aa5f8ba443eb8aab644035de86e931938fb94e7e Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Mon, 15 May 2017 15:02:16 +0100 Subject: [PATCH] Refactor tests for clarity --- tests/app/dao/test_services_dao.py | 12 +++++++----- tests/app/service/test_sender.py | 5 ++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index 435c4935b..89b909431 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -50,7 +50,7 @@ from app.models import ( KEY_TYPE_TEST ) -from tests.app.db import create_user +from tests.app.db import create_user, create_service from tests.app.conftest import ( sample_notification as create_notification, sample_notification_history as create_notification_history, @@ -787,9 +787,11 @@ def test_fetch_monthly_historical_template_stats_for_service_separates_templates assert str(template_two.id) in result.get('2016-04').keys() -def test_dao_fetch_active_users_for_service_returns_active_only(sample_service): - pending_user = create_user(email='foo@bar.com', state='pending') - dao_add_user_to_service(sample_service, pending_user) - users = dao_fetch_active_users_for_service(sample_service.id) +def test_dao_fetch_active_users_for_service_returns_active_only(notify_db, notify_db_session): + active_user = create_user(email='active@foo.com', state='active') + pending_user = create_user(email='pending@foo.com', state='pending') + service = create_service(user=active_user) + dao_add_user_to_service(service, pending_user) + users = dao_fetch_active_users_for_service(service.id) assert len(users) == 1 diff --git a/tests/app/service/test_sender.py b/tests/app/service/test_sender.py index 8f2d7ac07..3223e9e71 100644 --- a/tests/app/service/test_sender.py +++ b/tests/app/service/test_sender.py @@ -77,7 +77,10 @@ def test_send_notification_to_service_users_includes_user_fields_in_personalisat include_user_fields=['name', 'email_address', 'state'] ) - assert persist_mock.mock_calls[0][2]['personalisation'] == { + persist_call = persist_mock.call_args_list[0][1] + + assert len(persist_mock.call_args_list) == 1 + assert persist_call['personalisation'] == { 'name': sample_user.name, 'email_address': sample_user.email_address, 'state': sample_user.state,