Merge pull request #5316 from alphagov/get-response-for-checkboxes

Get response for checkboxes

Author: leenagupte

app/helpers/current_question_helper.rb

@@ -26,14 +26,6 @@ def prefill_value_is?(value)
     end
   end
 
-  def prefill_value_includes?(question, value)
-    if params[:previous_response]
-      question.to_response(params[:previous_response]).include?(value)
-    elsif params[:response]
-      params[:response].include?(value)
-    end
-  end
-
   def prefill_value_for(question, attribute = nil)
     if params[:previous_response]
       response = question.to_response(params[:previous_response])

app/presenters/checkbox_question_presenter.rb

@@ -1,6 +1,4 @@
 class CheckboxQuestionPresenter < QuestionWithOptionsPresenter
-  include CurrentQuestionHelper
-
   def response_labels(values)
     values.split(",").map do |value|
       if value == SmartAnswer::Question::Checkbox::NONE_OPTION
@@ -29,9 +27,15 @@ def checkboxes
         label: option[:label],
         value: option[:value],
         hint: option[:hint_text],
-        checked: prefill_value_includes?(self, option[:value]),
+        checked: checked?(option[:value]),
         exclusive: option[:value] == "none" || nil,
       }
     end
   end
+
+  def checked?(value)
+    return false if response_for_current_question.blank?
+
+    response_for_current_question.include?(value)
+  end
 end

app/presenters/flow_presenter.rb

@@ -83,7 +83,7 @@ def response_for_current_question
       responses = params[:responses]
       responses[current_state.current_node.to_s]
     elsif params[:previous_response].present?
-      params[:previous_response]
+      current_node.to_response(params[:previous_response])
     else
       question_number = current_state.path.size
       all_responses[question_number]

test/unit/checkbox_question_presenter_test.rb

@@ -15,6 +15,7 @@ class CheckboxQuestionPresenterTest < ActiveSupport::TestCase
       @renderer.stubs(:option).with(:option3).returns({ label: "Option 3" })
 
       @presenter = CheckboxQuestionPresenter.new(@question, nil, nil, renderer: @renderer)
+      @presenter.stubs(:response_for_current_question).returns(nil)
     end
 
     test "#response_labels returns option labels for responses" do
@@ -29,19 +30,19 @@ class CheckboxQuestionPresenterTest < ActiveSupport::TestCase
       assert_equal(%w[option1 option2 option3], @presenter.checkboxes.map { |c| c[:value] })
       assert_equal(["Option 1", "Option 2", "Option 3"], @presenter.checkboxes.map { |c| c[:label] })
       assert_equal([nil, "Hint 2", nil], @presenter.checkboxes.map { |c| c[:hint] })
-      assert_equal([nil, nil, nil], @presenter.checkboxes.map { |c| c[:checked] })
+      assert_equal([false, false, false], @presenter.checkboxes.map { |c| c[:checked] })
     end
 
     test "#checkboxes return array including an or divider for none options" do
       @question.none_option
       @renderer.stubs(:option).with(:none).returns({ label: "None" })
 
       expected_value = [
-        { label: "Option 1", value: "option1", hint: nil, checked: nil, exclusive: nil },
-        { label: "Option 2", value: "option2", hint: "Hint 2", checked: nil, exclusive: nil },
-        { label: "Option 3", value: "option3", hint: nil, checked: nil, exclusive: nil },
+        { label: "Option 1", value: "option1", hint: nil, checked: false, exclusive: nil },
+        { label: "Option 2", value: "option2", hint: "Hint 2", checked: false, exclusive: nil },
+        { label: "Option 3", value: "option3", hint: nil, checked: false, exclusive: nil },
         :or,
-        { label: "None", value: "none", hint: nil, checked: nil, exclusive: true },
+        { label: "None", value: "none", hint: nil, checked: false, exclusive: true },
       ]
 
       assert_equal expected_value, @presenter.checkboxes
@@ -53,5 +54,20 @@ class CheckboxQuestionPresenterTest < ActiveSupport::TestCase
 
       assert_equal "caption-text", @presenter.caption
     end
+
+    context "#checked?" do
+      should "return true if values were previously selected" do
+        @presenter.stubs(:response_for_current_question).returns(%w[option1 option2])
+        assert @presenter.checked?("option2")
+      end
+
+      should "return false if no values have been selected" do
+        @presenter.stubs(:response_for_current_question).returns(nil)
+
+        %w[option1 option2 option3 none].each do |option|
+          assert_not @presenter.checked?(option)
+        end
+      end
+    end
   end
 end

test/unit/flow_presenter_test.rb

@@ -153,6 +153,22 @@ def flow_registry
       flow_presenter = FlowPresenter.new(params, @flow)
       assert_nil(flow_presenter.response_for_current_question)
     end
+
+    should "format the response for checkbox questions" do
+      flow = SmartAnswer::Flow.new do
+        name "flow-name"
+        checkbox_question :first_question_key do
+          next_node { outcome :second_question_key }
+        end
+        value_question :second_question_key do
+          next_node { outcome :outcome_key }
+        end
+      end
+      params = { id: flow.name, responses: "question-1-answer", previous_response: "question-2-answer-a,question-2-answer-b" }
+      flow_presenter = FlowPresenter.new(params, flow)
+
+      assert_equal(["question-2-answer-a", "question-2-answer-b"], flow_presenter.response_for_current_question)
+    end
   end
 
   context "#normalize_responses_param" do