Correctly handle feet no inches and opposite

Author: jamiefalcus

…ning/nhsuk_forms/imperial_height_form.py …ing/nhsuk_forms/imperial_height_field.pylung_cancer_screening/nhsuk_forms/imperial_height_form.py renamed to lung_cancer_screening/nhsuk_forms/imperial_height_field.py lung_cancer_screening/nhsuk_forms/imperial_height_form.py renamed to lung_cancer_screening/nhsuk_forms/imperial_height_field.py

@@ -51,10 +51,11 @@ def __init__(self, *args, **kwargs):
             "min_value": 4,
             "max_value": 8,
             "error_messages": {
+                **error_messages,
                 'invalid': 'Feet must be in whole numbers',
                 'min_value': between_feet,
                 'max_value': between_feet,
-                **error_messages,
+                'incomplete': between_feet,
             },
         }
 
@@ -64,12 +65,14 @@ def __init__(self, *args, **kwargs):
             "min_value": 0,
             "max_value": 11,
             "error_messages": {
+                **error_messages,
                 'invalid': 'Inches must be in whole numbers',
                 'min_value': between_inches,
                 'max_value': between_inches,
-                **error_messages,
+                'incomplete': between_inches,
             },
         }
+
         fields = (
             IntegerField(**feet_kwargs),
             IntegerField(**inches_kwargs),

lung_cancer_screening/questions/forms/imperial_height_form.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from ...nhsuk_forms.imperial_height_form import ImperialHeightField
+from ...nhsuk_forms.imperial_height_field import ImperialHeightField
 from ..models.response_set import ResponseSet
 
 class ImperialHeightForm(forms.ModelForm):
@@ -16,7 +16,6 @@ def __init__(self, *args, **kwargs):
             require_all_fields=False,
             error_messages={
                 'required': 'Enter your height',
-                'incomplete': 'Enter your height'
             }
         )
 

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

@@ -53,7 +53,7 @@ def test_is_invalid_with_missing_data(self):
             participant=self.participant,
             instance=self.response_set,
             data={
-                "height_imperial_0": "5",
+                # missing feet
                 # missing inches
             }
         )
@@ -63,6 +63,36 @@ def test_is_invalid_with_missing_data(self):
             ["Enter your height"]
         )
 
+    def test_is_invalid_with_missing_inches(self):
+        form = ImperialHeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "height_imperial_0": "5",
+                # missing inches
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["height_imperial"],
+            ["Inches must be between 0 and 11"]
+        )
+
+    def test_is_invalid_with_missing_feet(self):
+        form = ImperialHeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                #"height_imperial_0": "5",
+                "height_imperial_1": "5"
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["height_imperial"],
+            ["Feet must be between 4 and 8"]
+        )
+
     def test_is_invalid_when_given_a_decimal_feet_value(self):
         form = ImperialHeightForm(
             participant=self.participant,

tests/features/questionnaire.feature

@@ -12,7 +12,7 @@ Feature: Questionnaire
     And I see a back link to "/date-of-birth"
     When I fill in and submit my height with "170"
     And I click "Back"
-    And I click "Switch to imperial"
+    And I click "Switch to feet and inches"
     When I fill in and submit my height with "5" feet and "7" inches
     Then I am on "/weight"
     And I see a back link to "/height"