Clear empty none_of_the_above_question when saving question

This is to handle the case when a user clicks the "Change" link on the
edit question page for a selection question and changes their answer
for "Should the list include an option for ‘None of the above’?" to
"Yes, and let people provide a different answer" but then clicks back
without entering a question text.

In this case, when they come to save their question, remove the blank
hash for none_of_the_above_question in the answer_settings. Form
fillers will be shown a "None of the above" option with no question in
this case.

Author: stephencdaly

app/input_objects/pages/question_input.rb

@@ -17,7 +17,7 @@ class Pages::QuestionInput < BaseInput
   def submit
     return false if invalid?
 
-    update_draft_question
+    prepare_for_save
 
     Page.create_and_update_form!(form_id:,
                                  question_text:,
@@ -33,16 +33,16 @@ def submit
   def update_page(page)
     return false if invalid?
 
-    update_draft_question
+    prepare_for_save
 
     page.assign_attributes(question_text:,
-      hint_text:,
-      is_optional:,
-      is_repeatable:,
-      answer_settings:,
-      page_heading:,
-      guidance_markdown:,
-      answer_type:)
+                           hint_text:,
+                           is_optional:,
+                           is_repeatable:,
+                           answer_settings:,
+                           page_heading:,
+                           guidance_markdown:,
+                           answer_type:)
     page.save_and_update_form
   end
 
@@ -79,6 +79,15 @@ def validate_question_text_length
 
 private
 
+  def prepare_for_save
+    compact_answer_settings
+    update_draft_question
+  end
+
+  def compact_answer_settings
+    answer_settings.delete(:none_of_the_above_question) if answer_settings[:none_of_the_above_question].blank?
+  end
+
   def update_draft_question
     draft_question.assign_attributes(
       question_text:,

spec/input_objects/pages/question_input_spec.rb

@@ -2,10 +2,11 @@
 
 RSpec.describe Pages::QuestionInput, type: :model do
   let(:form) { create :form }
+  let(:answer_settings) { { foo: "bar" } }
   let(:question_input) do
     build(:question_input, answer_type:, question_text:, draft_question:, is_optional:,
-      is_repeatable:, form_id: form.id, answer_settings: draft_question.answer_settings,
-      page_heading: draft_question.page_heading, guidance_markdown: draft_question.guidance_markdown)
+                           is_repeatable:, form_id: form.id, answer_settings:, page_heading: draft_question.page_heading,
+                           guidance_markdown: draft_question.guidance_markdown)
   end
   let(:draft_question) { build :address_draft_question, :with_guidance, question_text:, form_id: form.id }
   let(:question_text) { "What is your full name?" }
@@ -204,7 +205,10 @@
     end
 
     context "when not given a draft_question" do
-      let(:draft_question) { nil }
+      let(:question_input) do
+        build(:question_input, answer_type:, question_text:, draft_question: nil, is_optional:,
+                               is_repeatable:, form_id: form.id)
+      end
 
       it "is invalid" do
         expect(question_input).to be_invalid
@@ -321,6 +325,7 @@
       end
 
       it "updates the page attributes" do
+        page.reload
         expect(page.question_text).to eq question_input.question_text
         expect(page.hint_text).to eq question_input.hint_text
         expect(page.is_optional.to_s).to eq question_input.is_optional
@@ -330,6 +335,22 @@
         expect(page.guidance_markdown).to eq question_input.guidance_markdown
         expect(page.answer_type).to eq question_input.answer_type
       end
+
+      context "when the answer_settings has an empty hash for none_of_the_above_question" do
+        let(:answer_settings) { { foo: "bar", none_of_the_above_question: {} } }
+
+        it "removes the empty hash from the answer_settings" do
+          expect(page.reload.answer_settings).to eq DataStruct.recursive_new({ "foo": "bar" })
+        end
+      end
+
+      context "when the answer_settings has popolated none_of_the_above_question" do
+        let(:answer_settings) { { foo: "bar", none_of_the_above_question: { "question_text": "Enter something" } } }
+
+        it "keeps the populated none_of_the_above_question in the answer_settings" do
+          expect(page.reload.answer_settings).to eq DataStruct.recursive_new({ "foo": "bar", "none_of_the_above_question": { "question_text": "Enter something" } })
+        end
+      end
     end
   end
 end