From 4d4424657fdbf87f18233c93ba3cdb0a162f312f Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Fri, 6 Jul 2018 11:47:35 +0100 Subject: [PATCH] allow you to remove URL without removing bearer token --- app/main/forms.py | 4 +--- tests/app/main/views/test_api_integration.py | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 03d15883b..fb1baa7fa 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -829,9 +829,7 @@ class ServiceInboundNumberForm(StripWhitespaceForm): class CallbackForm(StripWhitespaceForm): def validate(self): - return super().validate() or ( - self.url.data == '' and self.bearer_token.data == '' - ) + return super().validate() or self.url.data == '' class ServiceReceiveMessagesCallbackForm(CallbackForm): diff --git a/tests/app/main/views/test_api_integration.py b/tests/app/main/views/test_api_integration.py index 4e0856c1d..8ee86a970 100644 --- a/tests/app/main/views/test_api_integration.py +++ b/tests/app/main/views/test_api_integration.py @@ -521,6 +521,7 @@ def test_callback_forms_validation( mock_get_empty_service_inbound_api, ), [], False), ]) +@pytest.mark.parametrize('bearer_token', ['', 'some-bearer-token']) @pytest.mark.parametrize('endpoint, expected_delete_url', [ ( 'main.delivery_status_callback', @@ -539,6 +540,7 @@ def test_callback_forms_can_be_cleared( delete_should_be_called, endpoint, expected_delete_url, + bearer_token, mocker, ): @@ -555,7 +557,7 @@ def test_callback_forms_can_be_cleared( service_id=service_one['id'], _data={ 'url': '', - 'bearer_token': '', + 'bearer_token': bearer_token, }, _expected_redirect=url_for( 'main.api_callbacks',