From 53a3f4c852c34389d60a3f0946a2cb0a31b459e0 Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Wed, 22 Nov 2023 11:06:15 -0700 Subject: [PATCH] Remove unnecessary logic/fix tests --- app/main/views/send.py | 14 +++----------- tests/app/main/views/test_send.py | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index dab41646e..180ad4c3a 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -275,19 +275,11 @@ def remove_notify_from_sender_options(sender_details): def verify_sender_options(sender): - if sender.get("sms_sender") in ["Notify.gov", "US Notify"] and sender["is_default"]: - return True - if ( - sender.get("sms_sender") not in ["Notify.gov", "US Notify"] - and not sender["is_default"] - ): - return True - if ( - sender.get("sms_sender") not in ["Notify.gov", "US Notify"] - and sender["is_default"] - ): + if sender.get("sms_sender") not in ["Notify.gov", "US Notify"]: return True + return False + def get_sender_context(sender_details, template_type): context = { diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 0d9c896e4..2870f4599 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -308,7 +308,7 @@ def test_usnotify_and_notifygov_sms_sender_removal_if_default(sender_data, mocke sender_details = remove_notify_from_sender_options(sender_data) - assert len(sender_details) == 3 + assert len(sender_details) == 2 def test_that_test_files_exist():