Show the none of the above question on the edit question page

If "Yes, and let people provide a different answer" was selected for
"Should the list include an option for ‘None of the above’?", show
the question that will be asked on the edit question page with a link
to change it.

If the question is optional, show " (optional)" after the question.

Author: stephencdaly

app/components/page_settings_summary_component/view.html.erb

@@ -53,6 +53,15 @@
                     href: @change_selections_options_path,
                     visually_hidden_text: t("page_settings_summary.selection.include_none_of_the_above")) %>
     <% end %>
+    <% if selection_none_of_the_above_question_text.present? %>
+      <%= summary_list.with_row do |row| %>
+        <%= row.with_key(text: t("page_settings_summary.selection.none_of_the_above_question")) %>
+        <%= row.with_value(text: selection_none_of_the_above_question_text) %>
+        <%= row.with_action(text: t("page_settings_summary.change"),
+                      href: change_selections_none_of_the_above_question_path,
+                      visually_hidden_text: t("page_settings_summary.selection.none_of_the_above_question"))  %>
+      <% end %>
+    <% end %>
   <% end %>
 
   <% if show_text_settings_summary %>

app/components/page_settings_summary_component/view.rb

@@ -20,6 +20,7 @@ def before_render
       @change_text_settings_path = change_text_settings_path
       @change_selections_only_one_option_path = change_selections_only_one_option_path
       @change_selections_options_path = change_selections_options_path
+      @change_selections_none_of_the_above_question_path = change_selections_none_of_the_above_question_path
     end
 
   private
@@ -45,6 +46,15 @@ def selection_options
       answer_settings[:selection_options]
     end
 
+    def selection_none_of_the_above_question_text
+      none_of_the_above_question = answer_settings[:none_of_the_above_question]
+      return unless @draft_question.is_optional? && none_of_the_above_question
+
+      return "#{none_of_the_above_question[:question_text]} (optional)" if none_of_the_above_question[:is_optional] == "true"
+
+      none_of_the_above_question[:question_text]
+    end
+
     def change_answer_type_path
       if is_new_question?
         type_of_answer_new_path(form_id: @draft_question.form_id)
@@ -98,6 +108,14 @@ def change_selections_options_path
       selection_options_edit_path_for_draft_question(@draft_question)
     end
 
+    def change_selections_none_of_the_above_question_path
+      return unless @draft_question.answer_type == "selection"
+
+      return selection_none_of_the_above_new_path(form_id: @draft_question.form_id) if is_new_question?
+
+      selection_none_of_the_above_edit_path(form_id: @draft_question.form_id, page_id: @draft_question.page_id)
+    end
+
     def change_text_settings_path
       return unless @draft_question.answer_type == "text"
 

config/locales/en.yml

@@ -1310,6 +1310,7 @@ en:
       how_many_selections: How many options can people select
       include_none_of_the_above: Include an option for ‘None of the above’
       'no': 'No'
+      none_of_the_above_question: If ‘None of the above’ is selected
       options: Options
       options_count: "%{number_of_options} options:"
       options_summary: Show %{number_of_options} options

spec/components/page_settings_summary_component/view_spec.rb

@@ -27,6 +27,8 @@
   let(:new_selection_type_path) { selection_type_new_path(form_id: draft_question.form_id) }
   let(:edit_selection_options_path) { selection_options_edit_path(form_id: draft_question.form_id, page_id: draft_question.page_id) }
   let(:new_selection_options_path) { selection_options_new_path(form_id: draft_question.form_id) }
+  let(:edit_selection_none_of_the_above_path) { selection_none_of_the_above_edit_path(form_id: draft_question.form_id, page_id: draft_question.page_id) }
+  let(:new_selection_none_of_the_above_path) { selection_none_of_the_above_new_path(form_id: draft_question.form_id) }
 
   before do
     allow(errors).to receive(:has_key?).with(:selection_options).and_return(selection_options_error_messages.present?)
@@ -122,7 +124,7 @@
         end
       end
 
-      context "when 'None of the above' is a setting" do
+      context "when 'None of the above' option is included" do
         let(:draft_question) { build :selection_draft_question, is_optional: true }
 
         it "renders the selection settings" do
@@ -139,6 +141,45 @@
           expect(rows[3].find(".govuk-summary-list__key")).to have_text "Include an option for ‘None of the above’"
           expect(rows[3].find(".govuk-summary-list__value")).to have_text "Yes"
         end
+
+        context "when there is a question if 'None of the above' is selected" do
+          let(:draft_question) { build :selection_draft_question, :with_mandatory_none_of_the_above_question }
+
+          it "includes a row for the none of the above question" do
+            rows = page.find_all(".govuk-summary-list__row")
+
+            expect(rows.length).to eq(5)
+            expect(rows[4].find(".govuk-summary-list__key")).to have_text I18n.t("page_settings_summary.selection.none_of_the_above_question")
+          end
+
+          it "has a link to change the none of the above question" do
+            expect(page).to have_link("Change #{I18n.t('page_settings_summary.selection.none_of_the_above_question')}", href: edit_selection_none_of_the_above_path)
+          end
+
+          context "when the none of the above question is mandatory" do
+            it "indicates that the none of the above question is mandatory" do
+              rows = page.find_all(".govuk-summary-list__row")
+              expect(rows[4].find(".govuk-summary-list__value")).to have_text "Enter your own option"
+            end
+          end
+
+          context "when the none of the above question is optional" do
+            let(:draft_question) { build :selection_draft_question, :with_optional_none_of_the_above_question }
+
+            it "indicates that the none of the above question is optional" do
+              rows = page.find_all(".govuk-summary-list__row")
+              expect(rows[4].find(".govuk-summary-list__value")).to have_text "Enter your own option (optional)"
+            end
+          end
+        end
+
+        context "when there is not a question if 'None of the above' is selected" do
+          it "does not include a row for the none of the above question" do
+            rows = page.find_all(".govuk-summary-list__row")
+
+            expect(rows.length).to eq(4)
+          end
+        end
       end
 
       it "renders the selection settings" do
@@ -199,7 +240,7 @@
     end
 
     context "when creating a new question" do
-      let(:draft_question) { build :selection_draft_question, page_id: nil }
+      let(:draft_question) { build :selection_draft_question, :with_mandatory_none_of_the_above_question, page_id: nil }
 
       it "has a link to change the answer type" do
         expect(page).to have_link("Change #{I18n.t('page_settings_summary.answer_type')}", href: new_answer_type_path)

spec/factories/models/draft_questions.rb

@@ -55,9 +55,42 @@
     end
 
     factory :selection_draft_question do
+      transient do
+        only_one_option { "true" }
+        selection_options { [{ name: "Option 1" }, { name: "Option 2" }] }
+      end
+
       question_text { Faker::Lorem.question }
       answer_type { "selection" }
-      answer_settings { { only_one_option: "true", selection_options: [{ name: "Option 1" }, { name: "Option 2" }] } }
+      answer_settings { { only_one_option:, selection_options: } }
+
+      trait :with_optional_none_of_the_above_question do
+        is_optional { true }
+        answer_settings do
+          {
+            only_one_option:,
+            selection_options:,
+            none_of_the_above_question: {
+              question_text: "Enter your own option",
+              is_optional: "true",
+            },
+          }
+        end
+      end
+
+      trait :with_mandatory_none_of_the_above_question do
+        is_optional { true }
+        answer_settings do
+          {
+            only_one_option:,
+            selection_options:,
+            none_of_the_above_question: {
+              question_text: "Enter your own option",
+              is_optional: "false",
+            },
+          }
+        end
+      end
     end
 
     factory :text_draft_question do