From 40e55f86be3ec7d904c8ef95b3ab1a5447be9912 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Tue, 5 Oct 2021 11:06:41 +0100
Subject: [PATCH] Extract logic to helper

---
 app/helpers/conditional_questions_helper.rb       |  8 ++++++++
 app/views/form/page.html.erb                      |  6 +-----
 spec/helpers/conditional_questions_helper_spec.rb | 13 +++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/helpers/conditional_questions_helper.rb b/app/helpers/conditional_questions_helper.rb
index dfda9142a..8967207f4 100644
--- a/app/helpers/conditional_questions_helper.rb
+++ b/app/helpers/conditional_questions_helper.rb
@@ -4,4 +4,12 @@ module ConditionalQuestionsHelper
       question["conditional_for"]
     }.compact.map(&:keys).flatten
   end
+
+  def display_question_key_div(page_info, question_key)
+    if conditional_questions_for_page(page_info).include?(question_key)
+      "<div id=#{question_key}_div style='display:none;'>".html_safe
+    else
+      "<div id=#{question_key}_div>".html_safe
+    end
+  end
 end
diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index 6d2d1888d..6e2ecac5c 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -14,11 +14,7 @@
   <%= form_with action: '/case_logs', method: "next_page", builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
 
     <% page_info["questions"].map do |question_key, question| %>
-      <% if conditional_questions_for_page(page_info).include?(question_key) %>
-        <div id=<%= "#{question_key}_div" %> style="display:none;">
-      <% else %>
-        <div id=<%= "#{question_key}_div" %> >
-      <% end %>
+      <%= display_question_key_div(page_info, question_key)%>
         <%= render partial: "form/#{question["type"]}_question", locals: { question_key: question_key, question: question, f: f } %>
       </div>
     <% end %>
diff --git a/spec/helpers/conditional_questions_helper_spec.rb b/spec/helpers/conditional_questions_helper_spec.rb
index c6b9d9008..889c237cd 100644
--- a/spec/helpers/conditional_questions_helper_spec.rb
+++ b/spec/helpers/conditional_questions_helper_spec.rb
@@ -12,4 +12,17 @@ RSpec.describe ConditionalQuestionsHelper do
       expect(conditional_questions_for_page(page)).to eq(conditional_pages)
     end
   end
+
+  describe "display question key div" do
+    let(:question_key) { "armed_forces" }
+    let(:conditional_question_key) { "armed_forces_injured" }
+
+    it "returns a non visible div for conditional questions" do
+      expect(display_question_key_div(page, conditional_question_key)).to match("style='display:none;'")
+    end
+
+    it "returns a visible div for conditional questions" do
+      expect(display_question_key_div(page, question_key)).not_to match("style='display:none;'")
+    end
+  end
 end