From eae1ccf6074a9ce6e992f38ff1a8f90e4c90180b Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Fri, 19 Jul 2019 15:30:21 +0100 Subject: [PATCH] Refactor following review --- app/models/service.py | 4 +--- tests/app/main/views/test_service_settings.py | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/models/service.py b/app/models/service.py index 02388736c..7e7662b20 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -268,9 +268,7 @@ class Service(JSONModel): @property def shouldnt_use_govuk_as_sms_sender(self): - return self.organisation_type in { - 'local', 'nhs', 'nhs_local', 'nhs_central', 'emergency_service', 'school_or_college', 'other' - } + return self.organisation_type != 'central' @cached_property def sms_senders(self): diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 4967ef871..c45d2777c 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -900,7 +900,7 @@ def test_should_not_show_go_live_button_if_checklist_not_complete( ), pytest.param( 1, - None, + 'central', 99, [{'is_default': True, 'sms_sender': 'GOVUK'}], '', @@ -931,14 +931,14 @@ def test_should_not_show_go_live_button_if_checklist_not_complete( ), ( 1, - 'local', + 'nhs_local', 0, [], 'Change your text message sender name Not completed', ), ( None, - 'local', + 'school_or_college', 1, [{'is_default': True, 'sms_sender': 'GOVUK'}], 'Change your text message sender name Not completed',