allow you to remove URL without removing bearer token

This commit is contained in:
Leo Hemsted
2018-07-06 11:47:35 +01:00
parent 7397e808a8
commit 4d4424657f
2 changed files with 4 additions and 4 deletions

View File

@@ -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):

View File

@@ -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',