Feet and inches between expected values

Author: jamiefalcus

lung_cancer_screening/nhsuk_forms/imperial_height_form.py

@@ -45,15 +45,28 @@ class ImperialHeightField(forms.MultiValueField):
     def __init__(self, *args, **kwargs):
         error_messages = kwargs.get("error_messages", {})
 
+        between_feet="Feet must be between 4 and 8"
+
         feet_kwargs = {
+            "min_value": 4,
+            "max_value": 8,
             "error_messages": {
                 'invalid': 'Feet must be in whole numbers',
+                'min_value': between_feet,
+                'max_value': between_feet,
                 **error_messages,
             },
         }
+
+        between_inches = "Inches must be between 0 and 11"
+
         inches_kwargs = {
+            "min_value": 0,
+            "max_value": 11,
             "error_messages": {
                 'invalid': 'Inches must be in whole numbers',
+                'min_value': between_inches,
+                'max_value': between_inches,
                 **error_messages,
             },
         }

lung_cancer_screening/nhsuk_forms/tests/unit/test_decimal_field.py

@@ -21,7 +21,6 @@ class TestForm(Form):
     def test_renders_nhs_input_with_suffix(self):
         class TestForm(Form):
             field = DecimalField(label="Abc", initial=1, max_value=10, suffix="cm")
-        print(TestForm()["field"].as_field_group())
         self.assertHTMLEqual(
             TestForm()["field"].as_field_group(),
             """

lung_cancer_screening/questions/tests/unit/forms/test_imperial_height_form.py

@@ -77,3 +77,63 @@ def test_is_invalid_when_given_a_decimal_feet_value(self):
             form.errors["height_imperial"],
             ["Feet must be in whole numbers"]
         )
+
+    def test_is_invalid_when_inches_under_11(self):
+        form = ImperialHeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "height_imperial_0": "5",
+                "height_imperial_1": "12"
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["height_imperial"],
+            ["Inches must be between 0 and 11"]
+        )
+
+    def test_is_invalid_when_inches_over_0(self):
+        form = ImperialHeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "height_imperial_0": "5",
+                "height_imperial_1": "-1"
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["height_imperial"],
+            ["Inches must be between 0 and 11"]
+        )
+
+    def test_is_invalid_when_feet_over_4(self):
+        form = ImperialHeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "height_imperial_0": "3",
+                "height_imperial_1": "10"
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["height_imperial"],
+            ["Feet must be between 4 and 8"]
+        )
+
+    def test_is_invalid_when_feet_under_8(self):
+        form = ImperialHeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "height_imperial_0": "9",
+                "height_imperial_1": "0"
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["height_imperial"],
+            ["Feet must be between 4 and 8"]
+        )