LGA 3373 Why were you treated differently (#78)

* Update discrimination where form to allow multiple selections

* Update discrimination why form to allow for multiple selections

* Introduce functional tests for onward routing

* Fix ruff formatting

Author: BenMillar-MOJ

app/categories/discrimination/forms.py

@@ -1,5 +1,5 @@
-from wtforms import RadioField, SelectMultipleField
-from app.categories.widgets import CategoryRadioInput, CategoryCheckboxInput
+from wtforms import SelectMultipleField
+from app.categories.widgets import CategoryCheckboxInput
 from app.categories.forms import QuestionForm
 from wtforms.validators import InputRequired
 
@@ -21,7 +21,11 @@ class DiscriminationWhereForm(DiscriminationQuestionForm):
         widget=CategoryCheckboxInput(
             show_divider=True, hint_text="You can select more than one."
         ),
-        validators=[InputRequired(message="Select where the discrimination happened")],
+        validators=[
+            InputRequired(
+                message="Select where the discrimination happened, or select ‘I’m not sure’"
+            )
+        ],
         choices=[
             ("work", "Work - including colleagues, employer or employment agency"),
             ("school", "School, college, university or other education setting"),
@@ -43,38 +47,39 @@ class DiscriminationWhereForm(DiscriminationQuestionForm):
 
 
 class DiscriminationWhyForm(DiscriminationQuestionForm):
-    title = "Why were you treated differently?"
+    title = "Why were you discriminated against?"
 
     next_step_mapping = {
-        "race": "categories.results.in_scope",
-        "sex": "categories.results.in_scope",
-        "disability": "categories.results.in_scope",
-        "religion": "categories.results.in_scope",
-        "age": "categories.results.in_scope",
-        "sexualorientation": "categories.results.in_scope",
-        "gender": "categories.results.in_scope",
-        "pregnancy": "categories.results.in_scope",
-        "none": "categories.results.alternative_help",
+        "*": "categories.results.in_scope",
+        "none": "categories.results.refer",
     }
 
-    question = RadioField(
+    question = SelectMultipleField(
         title,
-        widget=CategoryRadioInput(show_divider=True),
-        validators=[InputRequired(message="Select why you were treated differently")],
+        widget=CategoryCheckboxInput(
+            show_divider=True, hint_text="You can select more than one."
+        ),
+        validators=[InputRequired(message="Select why you were discriminated against")],
         choices=[
-            ("race", "Race, colour of skin, ethnicity"),
+            ("race", "Race, colour, ethnicity, nationality"),
             ("sex", "Sex (male or female)"),
             ("disability", "Disability, health condition, mental health condition"),
             ("religion", "Religion, belief, lack of religion"),
             ("age", "Age"),
-            ("sexualorientation", "Sexual orientation - gay, bi, other sexuality"),
-            ("gender", "Gender - trans, gender reassignment, other gender issue"),
             ("pregnancy", "Pregnancy or being a mother"),
+            (
+                "sexualorientation",
+                "Sexual orientation - gay, bisexual, other sexuality",
+            ),
+            (
+                "gender",
+                "Gender reassignment, being transgender, non-binary or gender-fluid",
+            ),
             (
                 "marriage",
-                "Married status - being married, in a civil partnership, unmarried",
+                "Married status - being married, in a civil partnership",
             ),
             ("", ""),
-            ("none", "None of the above"),
+            ("none", "None of these"),
         ],
     )

app/categories/views.py

@@ -104,13 +104,17 @@ def get_next_page(self, answer: str) -> redirect:
         Raises:
             ValueError if the answer does not have a mapping to a next page
         """
+        optional_answers = [
+            "notsure",
+            "none",
+        ]  # We should only route to these pages if they are the only answer
 
-        if "notsure" in answer and len(answer) == 1:
-            return redirect(url_for(self.form_class.next_step_mapping["notsure"]))
+        if len(answer) == 1 and answer[0] in optional_answers:
+            return redirect(url_for(self.form_class.next_step_mapping[answer[0]]))
 
         if isinstance(answer, list):
             for a in answer:
-                if a in self.form_class.next_step_mapping and a != "notsure":
+                if a in self.form_class.next_step_mapping and a not in optional_answers:
                     return redirect(url_for(self.form_class.next_step_mapping[a]))
             answer = "*"
 

tests/functional_tests/categories/discrimination/test_discrimination.py

@@ -1,27 +1,29 @@
 from playwright.sync_api import Page, expect
 import pytest
 
-routing = [
+where_form_routing = [
     pytest.param(
-        ["Work - including colleagues,"], "Why were you treated", id="single_answer"
+        ["Work - including colleagues,"],
+        "Why were you discriminated against",
+        id="single_answer",
     ),
     pytest.param(
         ["Work - including colleagues,", "School, college, university"],
-        "Why were you treated",
+        "Why were you discriminated against",
         id="multiple_answers",
     ),
     pytest.param(["not sure"], "Referral page", id="not_sure"),
     pytest.param(
-        ["Health or care", "not sure"], "Why were you treated", id="not_sure_and_answer"
+        ["Health or care", "not sure"],
+        "Why were you discriminated against",
+        id="not_sure_and_answer",
     ),
 ]
 
 
 @pytest.mark.usefixtures("live_server")
-@pytest.mark.parametrize("selections,expected_heading", routing)
-def test_discrimination_where_single_answer(
-    page: Page, selections: list, expected_heading: str
-):
+@pytest.mark.parametrize("selections,expected_heading", where_form_routing)
+def test_discrimination_where(page: Page, selections: list, expected_heading: str):
     """
     Test the discrimination form with different combinations of selections.
 
@@ -40,3 +42,51 @@ def test_discrimination_where_single_answer(
     page.get_by_role("button", name="Continue").click()
 
     expect(page.get_by_text(expected_heading)).to_be_visible()
+
+
+why_form_routing = [
+    pytest.param(
+        ["Race, colour, ethnicity, nationality"],
+        "Legal aid is available",
+        id="single_answer",
+    ),
+    pytest.param(
+        [
+            "Disability, health condition, mental health condition",
+            "Religion, belief, lack of religion",
+        ],
+        "Legal aid is available",
+        id="multiple_answers",
+    ),
+    pytest.param(["None of these"], "Referral page", id="not_sure"),
+    pytest.param(
+        ["Religion, belief, lack of religion", "None of these"],
+        "Legal aid is available",
+        id="not_sure_and_answer",
+    ),
+]
+
+
+@pytest.mark.usefixtures("live_server")
+@pytest.mark.parametrize("selections,expected_heading", why_form_routing)
+def test_discrimination_why(page: Page, selections: list, expected_heading: str):
+    """
+    Test the discrimination form with different combinations of selections.
+
+    Args:
+        page: Playwright page fixture
+        selections: List of labels to check
+        expected_heading: Text expected to be visible after submission
+    """
+    page.get_by_role("link", name="Discrimination").click()
+    page.get_by_label("Work - including colleagues,").check()
+    page.get_by_role("button", name="Continue").click()
+
+    # Check all selected options
+    for selection in selections:
+        page.get_by_label(selection).check()
+
+    # Submit form
+    page.get_by_role("button", name="Continue").click()
+
+    expect(page.get_by_text(expected_heading)).to_be_visible()