add tests

Author: saxix

tests/extras/testutils/factories/smart_fields.py

@@ -59,7 +59,12 @@ def fields(self, create, extracted, **kwargs):
         if extracted:
             fs = FieldsetFactory()
             for i in extracted:
-                FlexFieldFactory(fieldset=fs, name=i)
+                if isinstance(i, str):
+                    FlexFieldFactory(fieldset=fs, name=i)
+                elif isinstance(i, (tuple, list)):
+                    df = FieldDefinitionFactory(field_type=i[1])
+                    FlexFieldFactory(fieldset=fs, name=i[0], definition=df)
+
             self.fieldsets.add(fs)
 
 

tests/workspace/actions/test_ws_validate.py

@@ -4,6 +4,7 @@
 import freezegun
 import pytest
 from django.urls import reverse
+
 from testutils.utils import select_office
 
 from country_workspace.state import state

tests/workspace/test_ws_household.py

@@ -1,14 +1,18 @@
 from typing import TYPE_CHECKING
 
 import pytest
+from django import forms
 from django.urls import reverse
+from strategy_field.utils import fqn
+from testutils.factories import DataCheckerFactory
 from testutils.perms import user_grant_permissions
 from testutils.utils import select_office
 
 from country_workspace.state import state
 
 if TYPE_CHECKING:
     from django_webtest.pytest_plugin import MixinWithInstanceVariables
+    from hope_flex_fields.models import DataChecker
     from responses import RequestsMock
     from testutils.types import CWTestApp
 
@@ -100,16 +104,6 @@ def test_hh_validate_single(app: "CWTestApp", household: "CountryHousehold") ->
             assert res.status_code == 200
 
 
-def test_hh_validate_program(app: "CWTestApp", household: "CountryHousehold") -> None:
-    with select_office(app, household.country_office, household.program):
-        with user_grant_permissions(app._user, ["workspaces.change_countryhousehold"], household.program):
-            url = reverse("workspace:workspaces_countryhousehold_changelist")
-            res = app.get(url)
-            res.click("Validate Programme").follow()
-            household.refresh_from_db()
-            assert household.last_checked
-
-
 def test_hh_update_single(app: "CWTestApp", household: "CountryHousehold") -> None:
     with select_office(app, household.country_office, household.program):
         with user_grant_permissions(app._user, ["workspaces.change_countryhousehold"], household.program):
@@ -118,7 +112,7 @@ def test_hh_update_single(app: "CWTestApp", household: "CountryHousehold") -> No
             assert res.status_code == 200
 
 
-def test_validate_program(app: "CWTestApp", individual: "CountryIndividual"):
+def test_hh_validate_program(app: "CWTestApp", individual: "CountryIndividual"):
     program: "CountryProgram" = individual.program
     assert not individual.last_checked
 
@@ -130,3 +124,28 @@ def test_validate_program(app: "CWTestApp", individual: "CountryIndividual"):
         individual.refresh_from_db()
         assert individual.household.last_checked
         assert individual.last_checked
+
+
+@pytest.fixture
+def hh(household) -> "CountryHousehold":
+    dc: DataChecker = DataCheckerFactory(fields=[("address", fqn(forms.CharField))])
+    fld = dc.fieldsets.first().fields.get(name="address")
+    fld.attrs["required"] = True
+    fld.save()
+    household.flex_fields["address"] = None
+    household.save()
+
+    household.program.household_checker = dc
+    household.program.save()
+
+    return household
+
+
+def test_hh_validate(app: "CWTestApp", hh: "CountryHousehold"):
+    assert not hh.validate_with_checker()
+    assert hh.errors == {"address": ["This field is required."]}
+
+    hh.flex_fields["address"] = "abc"
+    hh.save()
+    assert hh.validate_with_checker()
+    assert hh.errors == {}