Merge pull request #560 from dod-ccpo/ko-dod-id-toggle

Toggle DOD ID Input For Officers

tests/conftest.py

@@ -103,15 +103,6 @@ def dummy_form():
     return DummyForm()
 
 
-@pytest.fixture
-def dummy_form_with_field():
-    def set_field(name, value):
-        data = DummyField(data=value, name=name)
-        return DummyForm(data=OrderedDict({name: data}))
-
-    return set_field
-
-
 @pytest.fixture
 def dummy_field():
     return DummyField()

tests/forms/test_validators.py

@@ -6,7 +6,7 @@ from atst.forms.validators import (
     IsNumber,
     PhoneNumber,
     ListItemsUnique,
-    RequiredIfNot,
+    RequiredIf,
 )
 
 
@@ -81,30 +81,19 @@ class TestListItemsUnique:
             validator(dummy_form, dummy_field)
 
 
-class TestRequiredIfNot:
-    def test_RequiredIfNot_requires_field_if_arg_is_falsy(
-        self, dummy_form_with_field, dummy_field
-    ):
-        form = dummy_form_with_field("arg", False)
-        validator = RequiredIfNot("arg")
+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(form, dummy_field)
+            validator(dummy_form, dummy_field)
 
-    def test_RequiredIfNot_does_not_require_field_if_arg_is_truthy(
-        self, dummy_form_with_field, dummy_field
+    def test_RequiredIf_does_not_require_field_if_arg_is_falsy(
+        self, dummy_form, dummy_field
     ):
-        form = dummy_form_with_field("arg", True)
-        validator = RequiredIfNot("arg")
+        validator = RequiredIf(lambda form: False)
         dummy_field.data = None
 
         with pytest.raises(StopValidation):
-            validator(form, dummy_field)
-
-    def test_RequiredIfNot_arg_is_None_raises_error(self, dummy_form, dummy_field):
-        validator = RequiredIfNot("arg")
-        dummy_field.data = "some data"
-
-        with pytest.raises(Exception):
             validator(dummy_form, dummy_field)