From 05ed1c6d68cb35843a1d718cea7b3f5671c59895 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 17 Jun 2019 13:24:48 -0400 Subject: [PATCH] Remove unused validation --- atst/forms/validators.py | 23 +---------------------- tests/forms/test_validators.py | 18 ------------------ 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/atst/forms/validators.py b/atst/forms/validators.py index 82dc1182..cac21e3e 100644 --- a/atst/forms/validators.py +++ b/atst/forms/validators.py @@ -2,7 +2,7 @@ from datetime import datetime import re from werkzeug.datastructures import FileStorage -from wtforms.validators import ValidationError, StopValidation +from wtforms.validators import ValidationError import pendulum from atst.utils.localization import translate @@ -83,27 +83,6 @@ def ListItemsUnique(message=translate("forms.validators.list_items_unique_messag return _list_items_unique -def RequiredIf(criteria_function, message=translate("forms.validators.is_required")): - """ A validator which makes a field required only if another field - has a truthy value - Args: - criteria_function (function): calling this function on form results - in a boolean value that we want to check against; - if it's True, we require the field - message (str): an optional message to display if the field is - required but hasNone value - """ - - def _required_if(form, field): - if criteria_function(form): - if field.data is None: - raise ValidationError(message) - else: - raise StopValidation() - - return _required_if - - def FileLength(max_length=50000000, message=None): def _file_length(_form, field): if field.data is None or not isinstance(field.data, FileStorage): diff --git a/tests/forms/test_validators.py b/tests/forms/test_validators.py index 8f0ae0e5..f19d06cb 100644 --- a/tests/forms/test_validators.py +++ b/tests/forms/test_validators.py @@ -75,24 +75,6 @@ class TestListItemsUnique: validator(dummy_form, dummy_field) -class TestRequiredIf: - def test_RequiredIf_requires_field_if_arg_is_truthy(self, dummy_form, dummy_field): - validator = RequiredIf(lambda form: True) - dummy_field.data = None - - with pytest.raises(ValidationError): - validator(dummy_form, dummy_field) - - def test_RequiredIf_does_not_require_field_if_arg_is_falsy( - self, dummy_form, dummy_field - ): - validator = RequiredIf(lambda form: False) - dummy_field.data = None - - with pytest.raises(StopValidation): - validator(dummy_form, dummy_field) - - class TestFileLength: def test_FileLength(self, dummy_form, dummy_field, pdf_upload): validator = FileLength(max_length=1)