From c3e3e761c95a770b24061f3913a2be70f63a97e6 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Tue, 25 Jan 2022 15:06:03 +0000
Subject: [PATCH] Conditional check box questions are shown on a new page

---
 app/models/validations/household_validations.rb |  4 ----
 config/forms/2021_2022.json                     | 12 ++++++++----
 spec/models/case_log_spec.rb                    | 13 -------------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb
index edc414d9a..6d364667d 100644
--- a/app/models/validations/household_validations.rb
+++ b/app/models/validations/household_validations.rb
@@ -4,10 +4,6 @@ module Validations::HouseholdValidations
   def validate_reasonable_preference(record)
     if record.homeless == "No" && record.reasonpref == "Yes"
       record.errors.add :reasonpref, I18n.t("validations.household.reasonpref.not_homeless")
-    elsif record.reasonpref == "Yes"
-      if [record.rp_homeless, record.rp_insan_unsat, record.rp_medwel, record.rp_hardship, record.rp_dontknow].none? { |a| a == "Yes" }
-        record.errors.add :reasonable_preference_reason, I18n.t("validations.household.reasonable_preference_reason.reason_required")
-      end
     elsif record.reasonpref == "No"
       if [record.rp_homeless, record.rp_insan_unsat, record.rp_medwel, record.rp_hardship, record.rp_dontknow].any? { |a| a == "Yes" }
         record.errors.add :reasonable_preference_reason, I18n.t("validations.household.reasonable_preference_reason.reason_not_required")
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 24cd8d666..8187a04f8 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -3185,11 +3185,15 @@
                     "1": "No",
                     "divider": true,
                     "2": "Don’t know"
-                  },
-                  "conditional_for": {
-                    "reasonable_preference_reason": ["Yes"]
                   }
-                },
+                }
+              }
+            },
+            "reasonable_preference_reason": {
+              "header": "Reason for reasonable preference being given",
+              "description": "",
+              "depends_on": [{ "reasonpref": "Yes" }],
+              "questions": {
                 "reasonable_preference_reason": {
                   "check_answer_label": "Reason for reasonable preference",
                   "header": "Why were they given reasonable preference?",
diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb
index a8dd15b97..376641f78 100644
--- a/spec/models/case_log_spec.rb
+++ b/spec/models/case_log_spec.rb
@@ -73,19 +73,6 @@ RSpec.describe Form, type: :model do
     end
 
     context "reasonable preference is yes" do
-      it "validates a reason must be selected" do
-        expect {
-          CaseLog.create!(reasonpref: "Yes",
-                          rp_homeless: nil,
-                          rp_insan_unsat: nil,
-                          rp_medwel: nil,
-                          rp_hardship: nil,
-                          rp_dontknow: nil,
-                          owning_organisation: owning_organisation,
-                          managing_organisation: managing_organisation)
-        }.to raise_error(ActiveRecord::RecordInvalid)
-      end
-
       it "validates that previously homeless should be selected" do
         expect {
           CaseLog.create!(