From dede336b3bcbfee9083cb2c05f2b97c2e47f11a4 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Tue, 3 Oct 2017 13:35:09 +0100 Subject: [PATCH] Update tests to not use letter contact block from services table A few test updates were needed after rebasing onto master. --- app/models.py | 2 +- tests/app/conftest.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models.py b/app/models.py index a7ecfdddd..edf0745a4 100644 --- a/app/models.py +++ b/app/models.py @@ -541,7 +541,7 @@ class Template(db.Model): return LetterDVLATemplate( {'content': self.content, 'subject': self.subject}, notification_reference=1, - contact_block=self.service.letter_contact_block, + contact_block=self.service.get_default_letter_contact(), ) def serialize(self): diff --git a/tests/app/conftest.py b/tests/app/conftest.py index 86c748df3..a9dfa0a1b 100644 --- a/tests/app/conftest.py +++ b/tests/app/conftest.py @@ -46,7 +46,8 @@ from tests.app.db import ( create_notification, create_service, create_api_key, - create_inbound_number + create_inbound_number, + create_letter_contact, ) @@ -138,7 +139,6 @@ def sample_service( email_from=None, permissions=[SMS_TYPE, EMAIL_TYPE], research_mode=None, - letter_contact_block='London,\nSW1A 1AA', ): if user is None: user = create_user() @@ -183,7 +183,9 @@ def sample_service_full_permissions(notify_db, notify_db_session): @pytest.fixture(scope='function') def sample_service_custom_letter_contact_block(notify_db, notify_db_session): - return sample_service(notify_db, notify_db_session, letter_contact_block='((contact block))') + service = sample_service(notify_db, notify_db_session) + create_letter_contact(service, contact_block='((contact block))') + return service @pytest.fixture(scope='function')