Stop calling fixtures as functions in the tests

tests/app/notifications/test_notifications_ses_callback.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 import pytest
 from flask import json
 from sqlalchemy.exc import SQLAlchemyError
@@ -8,7 +6,6 @@ from app.dao.notifications_dao import get_notification_by_id
 from app.models import Complaint
 from app.notifications.notifications_ses_callback import handle_complaint
 
-from tests.app.conftest import sample_notification as create_sample_notification
 from tests.app.db import (
     create_notification, ses_complaint_callback_malformed_message_id,
     ses_complaint_callback_with_missing_complaint_type,
@@ -17,19 +14,8 @@ from tests.app.db import (
 )
 
 
-def test_ses_callback_should_not_set_status_once_status_is_delivered(client,
-                                                                     notify_db,
-                                                                     notify_db_session,
-                                                                     sample_email_template,
-                                                                     mocker):
-    notification = create_sample_notification(
-        notify_db,
-        notify_db_session,
-        template=sample_email_template,
-        reference='ref',
-        status='delivered',
-        sent_at=datetime.utcnow()
-    )
+def test_ses_callback_should_not_set_status_once_status_is_delivered(sample_email_template):
+    notification = create_notification(sample_email_template, status='delivered', )
 
     assert get_notification_by_id(notification.id).status == 'delivered'
 

tests/app/notifications/test_process_notification.py

@@ -23,8 +23,6 @@ from app.notifications.process_notifications import (
 )
 from notifications_utils.recipients import validate_and_format_phone_number, validate_and_format_email_address
 from app.v2.errors import BadRequestError
-from tests.app.conftest import sample_api_key as create_api_key
-
 from tests.app.db import create_service, create_template
 
 
@@ -129,10 +127,8 @@ def test_cache_is_not_incremented_on_failure_to_persist_notification(sample_api_
 
 
 def test_persist_notification_does_not_increment_cache_if_test_key(
-        notify_db, notify_db_session, sample_template, sample_job, mocker
+        sample_template, sample_job, mocker, sample_test_api_key
 ):
-    api_key = create_api_key(notify_db=notify_db, notify_db_session=notify_db_session, service=sample_template.service,
-                             key_type='test')
     mocker.patch('app.notifications.process_notifications.redis_store.get', return_value="cache")
     mocker.patch('app.notifications.process_notifications.redis_store.get_all_from_hash', return_value="cache")
     daily_limit_cache = mocker.patch('app.notifications.process_notifications.redis_store.incr')
@@ -147,8 +143,8 @@ def test_persist_notification_does_not_increment_cache_if_test_key(
         service=sample_template.service,
         personalisation={},
         notification_type='sms',
-        api_key_id=api_key.id,
-        key_type=api_key.key_type,
+        api_key_id=sample_test_api_key.id,
+        key_type=sample_test_api_key.key_type,
         job_id=sample_job.id,
         job_row_number=100,
         reference="ref",
@@ -472,26 +468,24 @@ def test_persist_email_notification_stores_normalised_email(
 )
 def test_persist_letter_notification_finds_correct_postage(
     mocker,
-    notify_db,
-    notify_db_session,
     postage_argument,
     template_postage,
-    expected_postage
+    expected_postage,
+    sample_service_full_permissions,
+    sample_api_key,
 ):
-    service = create_service(service_permissions=[LETTER_TYPE])
-    api_key = create_api_key(notify_db, notify_db_session, service=service)
-    template = create_template(service, template_type=LETTER_TYPE, postage=template_postage)
+    template = create_template(sample_service_full_permissions, template_type=LETTER_TYPE, postage=template_postage)
     mocker.patch('app.dao.templates_dao.dao_get_template_by_id', return_value=template)
     persist_notification(
         template_id=template.id,
         template_version=template.version,
         template_postage=template.postage,
         recipient="Jane Doe, 10 Downing Street, London",
-        service=service,
+        service=sample_service_full_permissions,
         personalisation=None,
         notification_type=LETTER_TYPE,
-        api_key_id=api_key.id,
-        key_type=api_key.key_type,
+        api_key_id=sample_api_key.id,
+        key_type=sample_api_key.key_type,
         postage=postage_argument
     )
     persisted_notification = Notification.query.all()[0]

tests/app/notifications/test_receive_notification.py

@@ -17,7 +17,6 @@ from app.notifications.receive_notifications import (
 from app.models import InboundSms, EMAIL_TYPE, SMS_TYPE, INBOUND_SMS_TYPE
 from tests.conftest import set_config
 from tests.app.db import create_inbound_number, create_service, create_service_with_inbound_number
-from tests.app.conftest import sample_service
 
 
 def firetext_post(client, data, auth=True, password='testkey'):
@@ -132,9 +131,8 @@ def test_receive_notification_from_firetext_without_permissions_does_not_persist
 
 
 def test_receive_notification_without_permissions_does_not_create_inbound_even_with_inbound_number_set(
-        client, mocker, notify_db, notify_db_session):
-    service = sample_service(notify_db, notify_db_session, permissions=[SMS_TYPE])
-    inbound_number = create_inbound_number('1', service_id=service.id, active=True)
+        client, mocker, sample_service):
+    inbound_number = create_inbound_number('1', service_id=sample_service.id, active=True)
 
     mocked_send_inbound_sms = mocker.patch(
         "app.notifications.receive_notifications.tasks.send_inbound_sms_to_service.apply_async")