Add dividers

1 month ago · 17a483aa08
43 changed files with 68 additions and 28 deletions
--- a/app/models/form/lettings/questions/armedforces.rb
+++ b/app/models/form/lettings/questions/armedforces.rb
@ -13,8 +13,8 @@ class Form::Lettings::Questions::Armedforces < ::Form::Question
    "4" => { "value" => "Yes – the person is a current or former reserve" },
    "5" => { "value" => "Yes – the person is a spouse or civil partner of a UK armed forces member and has been bereaved or separated from them within the last 2 years" },
    "2" => { "value" => "No" },
-    "divider" => { "value" => true },
    "3" => { "value" => "Person prefers not to say" },
+    "divider" => { "value" => true },
    "6" => { "value" => "Don’t know" },
  }.freeze

--- a/app/models/form/lettings/questions/hb.rb
+++ b/app/models/form/lettings/questions/hb.rb
@ -12,8 +12,8 @@ class Form::Lettings::Questions::Hb < ::Form::Question
    "1" => { "value" => "Housing benefit" },
    "6" => { "value" => "Universal Credit housing element" },
    "9" => { "value" => "Neither" },
-    "divider" => { "value" => true },
    "3" => { "value" => "Don’t know" },
+    "divider" => { "value" => true },
    "10" => { "value" => "Tenant prefers not to say" },
  }.freeze

--- a/app/models/form/lettings/questions/hbrentshortfall.rb
+++ b/app/models/form/lettings/questions/hbrentshortfall.rb
@ -11,6 +11,7 @@ class Form::Lettings::Questions::Hbrentshortfall < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
+    "divider" => { "value" => true },
    "3" => { "value" => "Don’t know" },
  }.freeze

--- a/app/models/form/lettings/questions/housingneeds_other.rb
+++ b/app/models/form/lettings/questions/housingneeds_other.rb
@ -13,7 +13,8 @@ class Form::Lettings::Questions::HousingneedsOther < ::Form::Question
      {
        "1" => { "value" => "Yes" },
        "0" => { "value" => "No" },
-        "2" => { "value" => "Don't know" },
+        "divider" => { "value" => true },
+        "2" => { "value" => "Don’t know" },
      }.freeze
    else
      {
--- a/app/models/form/lettings/questions/reason.rb
+++ b/app/models/form/lettings/questions/reason.rb
@ -83,9 +83,9 @@ class Form::Lettings::Questions::Reason < ::Form::Question
        "18" => { "value" => "To move to accommodation with support" },
        "19" => { "value" => "To move to independent accommodation" },
        "20" => { "value" => "Other" },
-        "28" => { "value" => "Don’t know" },
-        "divider" => { "value" => true },
        "47" => { "value" => "Tenant prefers not to say" },
+        "divider" => { "value" => true },
+        "28" => { "value" => "Don’t know" },
      }.freeze
    end

--- a/app/models/form/sales/questions/armed_forces.rb
+++ b/app/models/form/sales/questions/armed_forces.rb
@ -11,7 +11,8 @@ class Form::Sales::Questions::ArmedForces < ::Form::Question
    "1" => { "value" => "Yes" },
    "7" => { "value" => "No" },
    "3" => { "value" => "Buyer prefers not to say" },
-    "8" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "8" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR = { 2023 => 62, 2024 => 64, 2025 => 61 }.freeze
--- a/app/models/form/sales/questions/armed_forces_spouse.rb
+++ b/app/models/form/sales/questions/armed_forces_spouse.rb
@ -11,7 +11,8 @@ class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question
    "4" => { "value" => "Yes" },
    "5" => { "value" => "No" },
    "6" => { "value" => "Buyer prefers not to say" },
-    "7" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "7" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR = { 2023 => 64, 2024 => 66, 2025 => 63 }.freeze
--- a/app/models/form/sales/questions/buyer1_previous_tenure.rb
+++ b/app/models/form/sales/questions/buyer1_previous_tenure.rb
@ -17,6 +17,7 @@ class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question
      "6" => { "value" => "Living with family or friends" },
      "7" => { "value" => "Temporary accommodation" },
      "9" => { "value" => "Other" },
+      "divider" => { "value" => true },
      "0" => { "value" => "Don’t know" },
    }
  end
--- a/app/models/form/sales/questions/buyer2_living_in.rb
+++ b/app/models/form/sales/questions/buyer2_living_in.rb
@ -10,7 +10,8 @@ class Form::Sales::Questions::Buyer2LivingIn < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
-    "3" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "3" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR = { 2023 => 60, 2024 => 62, 2025 => 59 }.freeze
--- a/app/models/form/sales/questions/buyer_still_serving.rb
+++ b/app/models/form/sales/questions/buyer_still_serving.rb
@ -11,7 +11,8 @@ class Form::Sales::Questions::BuyerStillServing < ::Form::Question
    "4" => { "value" => "Yes" },
    "5" => { "value" => "No" },
    "6" => { "value" => "Buyer prefers not to say" },
-    "7" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "7" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR = { 2023 => 63, 2024 => 65, 2025 => 62 }.freeze
--- a/app/models/form/sales/questions/extra_borrowing.rb
+++ b/app/models/form/sales/questions/extra_borrowing.rb
@ -12,7 +12,8 @@ class Form::Sales::Questions::ExtraBorrowing < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
-    "3" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "3" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
--- a/app/models/form/sales/questions/household_disability.rb
+++ b/app/models/form/sales/questions/household_disability.rb
@ -10,7 +10,8 @@ class Form::Sales::Questions::HouseholdDisability < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
-    "3" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "3" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR = { 2023 => 65, 2024 => 67, 2025 => 64 }.freeze
--- a/app/models/form/sales/questions/household_wheelchair.rb
+++ b/app/models/form/sales/questions/household_wheelchair.rb
@ -10,7 +10,8 @@ class Form::Sales::Questions::HouseholdWheelchair < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
-    "3" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "3" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR = { 2023 => 66, 2024 => 68, 2025 => 65 }.freeze
--- a/app/models/form/sales/questions/housing_benefits.rb
+++ b/app/models/form/sales/questions/housing_benefits.rb
@ -11,8 +11,8 @@ class Form::Sales::Questions::HousingBenefits < ::Form::Question
  ANSWER_OPTIONS = {
    "2" => { "value" => "Housing benefit" },
    "3" => { "value" => "Universal Credit housing element" },
-    "divider" => { "value" => true },
    "1" => { "value" => "Neither housing benefit or Universal Credit housing element" },
+    "divider" => { "value" => true },
    "4" => { "value" => "Don’t know " },
  }.freeze

--- a/app/models/form/sales/questions/la_nominations.rb
+++ b/app/models/form/sales/questions/la_nominations.rb
@ -11,6 +11,7 @@ class Form::Sales::Questions::LaNominations < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
+    "divider" => { "value" => true },
    "3" => { "value" => "Don’t know" },
  }.freeze

--- a/app/models/form/sales/questions/mortgageused.rb
+++ b/app/models/form/sales/questions/mortgageused.rb
@ -22,11 +22,12 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
+    "divider" => { "value" => true },
    "3" => { "value" => "Don’t know" },
  }.freeze

  def answer_options_without_dont_know
-    ANSWER_OPTIONS.reject { |key, _v| key == "3" }
+    ANSWER_OPTIONS.reject { |key, _v| %w[3 divider].include?(key) }
  end

  def question_number_from_year_and_ownership
--- a/app/models/form/sales/questions/number_joint_buyers.rb
+++ b/app/models/form/sales/questions/number_joint_buyers.rb
@ -10,6 +10,7 @@ class Form::Sales::Questions::NumberJointBuyers < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
+    "divider" => { "value" => true },
    "3" => { "value" => "Don’t know" },
  }.freeze

--- a/app/models/form/sales/questions/previous_tenure.rb
+++ b/app/models/form/sales/questions/previous_tenure.rb
@ -13,6 +13,7 @@ class Form::Sales::Questions::PreviousTenure < ::Form::Question
    "2" => { "value" => "Affordable Rent" },
    "3" => { "value" => "London Affordable Rent" },
    "9" => { "value" => "Other" },
+    "divider" => { "value" => true },
    "10" => { "value" => "Don’t know" },
  }.freeze

--- a/app/models/form/sales/questions/previous_tenure_buyer2.rb
+++ b/app/models/form/sales/questions/previous_tenure_buyer2.rb
@ -16,7 +16,8 @@ class Form::Sales::Questions::PreviousTenureBuyer2 < ::Form::Question
    "6" => { "value" => "Living with family or friends" },
    "7" => { "value" => "Temporary accommodation" },
    "9" => { "value" => "Other" },
-    "0" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "0" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR = { 2023 => 61, 2024 => 63, 2025 => 60 }.freeze
--- a/app/models/form/sales/questions/prevown.rb
+++ b/app/models/form/sales/questions/prevown.rb
@ -11,6 +11,7 @@ class Form::Sales::Questions::Prevown < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
+    "divider" => { "value" => true },
    "3" => { "value" => "Don’t know" },
  }.freeze

--- a/app/models/form/sales/questions/prevshared.rb
+++ b/app/models/form/sales/questions/prevshared.rb
@ -10,6 +10,7 @@ class Form::Sales::Questions::Prevshared < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
+    "divider" => { "value" => true },
    "3" => { "value" => "Don’t know" },
  }.freeze

--- a/app/models/form/sales/questions/property_wheelchair_accessible.rb
+++ b/app/models/form/sales/questions/property_wheelchair_accessible.rb
@ -11,7 +11,8 @@ class Form::Sales::Questions::PropertyWheelchairAccessible < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
-    "3" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "3" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR = { 2023 => 17, 2024 => 21, 2025 => 19 }.freeze
--- a/app/models/form/sales/questions/staircase.rb
+++ b/app/models/form/sales/questions/staircase.rb
@ -17,6 +17,7 @@ class Form::Sales::Questions::Staircase < ::Form::Question
      {
        "1" => { "value" => "Yes" },
        "2" => { "value" => "No" },
+        "divider" => { "value" => true },
        "3" => { "value" => "Don’t know" },
      }.freeze
    end
--- a/app/models/form/sales/questions/staircase_sale.rb
+++ b/app/models/form/sales/questions/staircase_sale.rb
@ -11,7 +11,8 @@ class Form::Sales::Questions::StaircaseSale < ::Form::Question
  ANSWER_OPTIONS = {
    "1" => { "value" => "Yes" },
    "2" => { "value" => "No" },
-    "3" => { "value" => "Don't know" },
+    "divider" => { "value" => true },
+    "3" => { "value" => "Don’t know" },
  }.freeze

  QUESTION_NUMBER_FROM_YEAR = { 2023 => 79, 2024 => 81, 2025 => 92 }.freeze
--- a/spec/models/form/lettings/questions/housingneeds_other_spec.rb
+++ b/spec/models/form/lettings/questions/housingneeds_other_spec.rb
@ -49,7 +49,8 @@ RSpec.describe Form::Lettings::Questions::HousingneedsOther, type: :model do
      expect(question.answer_options).to eq({
        "1" => { "value" => "Yes" },
        "0" => { "value" => "No" },
-        "2" => { "value" => "Don't know" },
+        "divider" => { "value" => true },
+        "2" => { "value" => "Don’t know" },
      })
    end
  end
--- a/spec/models/form/sales/questions/armed_forces_spec.rb
+++ b/spec/models/form/sales/questions/armed_forces_spec.rb
@ -28,7 +28,8 @@ RSpec.describe Form::Sales::Questions::ArmedForces, type: :model do
      "1" => { "value" => "Yes" },
      "7" => { "value" => "No" },
      "3" => { "value" => "Buyer prefers not to say" },
-      "8" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "8" => { "value" => "Don’t know" },
    })
  end
 end
--- a/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
+++ b/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
@ -28,7 +28,8 @@ RSpec.describe Form::Sales::Questions::ArmedForcesSpouse, type: :model do
      "4" => { "value" => "Yes" },
      "5" => { "value" => "No" },
      "6" => { "value" => "Buyer prefers not to say" },
-      "7" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "7" => { "value" => "Don’t know" },
    })
  end
 end
--- a/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
@ -32,6 +32,7 @@ RSpec.describe Form::Sales::Questions::Buyer1PreviousTenure, type: :model do
      "6" => { "value" => "Living with family or friends" },
      "7" => { "value" => "Temporary accommodation" },
      "9" => { "value" => "Other" },
+      "divider" => { "value" => true },
      "0" => { "value" => "Don’t know" },
    })
  end
--- a/spec/models/form/sales/questions/buyer2_living_in_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_living_in_spec.rb
@ -25,7 +25,8 @@ RSpec.describe Form::Sales::Questions::Buyer2LivingIn, type: :model do
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
-      "3" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "3" => { "value" => "Don’t know" },
    })
  end
 end
--- a/spec/models/form/sales/questions/buyer_still_serving_spec.rb
+++ b/spec/models/form/sales/questions/buyer_still_serving_spec.rb
@ -28,7 +28,8 @@ RSpec.describe Form::Sales::Questions::BuyerStillServing, type: :model do
      "4" => { "value" => "Yes" },
      "5" => { "value" => "No" },
      "6" => { "value" => "Buyer prefers not to say" },
-      "7" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "7" => { "value" => "Don’t know" },
    })
  end
 end
--- a/spec/models/form/sales/questions/extra_borrowing_spec.rb
+++ b/spec/models/form/sales/questions/extra_borrowing_spec.rb
@ -27,7 +27,8 @@ RSpec.describe Form::Sales::Questions::ExtraBorrowing, type: :model do
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
-      "3" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "3" => { "value" => "Don’t know" },
    })
  end

--- a/spec/models/form/sales/questions/household_disability_spec.rb
+++ b/spec/models/form/sales/questions/household_disability_spec.rb
@ -27,7 +27,8 @@ RSpec.describe Form::Sales::Questions::HouseholdDisability, type: :model do
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
-      "3" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "3" => { "value" => "Don’t know" },
    })
  end

--- a/spec/models/form/sales/questions/household_wheelchair_spec.rb
+++ b/spec/models/form/sales/questions/household_wheelchair_spec.rb
@ -27,7 +27,8 @@ RSpec.describe Form::Sales::Questions::HouseholdWheelchair, type: :model do
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
-      "3" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "3" => { "value" => "Don’t know" },
    })
  end

--- a/spec/models/form/sales/questions/la_nominations_spec.rb
+++ b/spec/models/form/sales/questions/la_nominations_spec.rb
@ -27,6 +27,7 @@ RSpec.describe Form::Sales::Questions::LaNominations, type: :model do
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
+      "divider" => { "value" => true },
      "3" => { "value" => "Don’t know" },
    })
  end
--- a/spec/models/form/sales/questions/mortgageused_spec.rb
+++ b/spec/models/form/sales/questions/mortgageused_spec.rb
@ -25,6 +25,7 @@ RSpec.describe Form::Sales::Questions::Mortgageused, type: :model do
      expect(question.answer_options).to eq({
        "1" => { "value" => "Yes" },
        "2" => { "value" => "No" },
+        "divider" => { "value" => true },
        "3" => { "value" => "Don’t know" },
      })
    end
@ -156,6 +157,7 @@ private
    expect(question.displayed_answer_options(log)).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
+      "divider" => { "value" => true },
      "3" => { "value" => "Don’t know" },
    })
  end
--- a/spec/models/form/sales/questions/number_joint_buyers_spec.rb
+++ b/spec/models/form/sales/questions/number_joint_buyers_spec.rb
@ -33,6 +33,7 @@ RSpec.describe Form::Sales::Questions::NumberJointBuyers, type: :model do
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
+      "divider" => { "value" => true },
      "3" => { "value" => "Don’t know" },
    })
  end
--- a/spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
+++ b/spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
@ -31,7 +31,8 @@ RSpec.describe Form::Sales::Questions::PreviousTenureBuyer2, type: :model do
      "6" => { "value" => "Living with family or friends" },
      "7" => { "value" => "Temporary accommodation" },
      "9" => { "value" => "Other" },
-      "0" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "0" => { "value" => "Don’t know" },
    })
  end
 end
--- a/spec/models/form/sales/questions/previous_tenure_spec.rb
+++ b/spec/models/form/sales/questions/previous_tenure_spec.rb
@ -29,6 +29,7 @@ RSpec.describe Form::Sales::Questions::PreviousTenure, type: :model do
      "2" => { "value" => "Affordable Rent" },
      "3" => { "value" => "London Affordable Rent" },
      "9" => { "value" => "Other" },
+      "divider" => { "value" => true },
      "10" => { "value" => "Don’t know" },
    })
  end
--- a/spec/models/form/sales/questions/prevown_spec.rb
+++ b/spec/models/form/sales/questions/prevown_spec.rb
@ -28,6 +28,7 @@ RSpec.describe Form::Sales::Questions::Prevown, type: :model do
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
+      "divider" => { "value" => true },
      "3" => { "value" => "Don’t know" },
    })
  end
--- a/spec/models/form/sales/questions/prevshared_spec.rb
+++ b/spec/models/form/sales/questions/prevshared_spec.rb
@ -27,6 +27,7 @@ RSpec.describe Form::Sales::Questions::Prevshared, type: :model do
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
+      "divider" => { "value" => true },
      "3" => { "value" => "Don’t know" },
    })
  end
--- a/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
@ -33,7 +33,8 @@ RSpec.describe Form::Sales::Questions::PropertyWheelchairAccessible, type: :mode
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
-      "3" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "3" => { "value" => "Don’t know" },
    })
  end
 end
--- a/spec/models/form/sales/questions/staircase_sale_spec.rb
+++ b/spec/models/form/sales/questions/staircase_sale_spec.rb
@ -31,7 +31,8 @@ RSpec.describe Form::Sales::Questions::StaircaseSale, type: :model do
    expect(question.answer_options).to eq({
      "1" => { "value" => "Yes" },
      "2" => { "value" => "No" },
-      "3" => { "value" => "Don't know" },
+      "divider" => { "value" => true },
+      "3" => { "value" => "Don’t know" },
    })
  end

--- a/spec/models/form/sales/questions/staircase_spec.rb
+++ b/spec/models/form/sales/questions/staircase_spec.rb
@ -33,6 +33,7 @@ RSpec.describe Form::Sales::Questions::Staircase, type: :model do
      expect(question.answer_options).to eq({
        "1" => { "value" => "Yes" },
        "2" => { "value" => "No" },
+        "divider" => { "value" => true },
        "3" => { "value" => "Don’t know" },
      })
    end