From 5d820eddea6fdf32eaa51b34acb02fb9d29f26de Mon Sep 17 00:00:00 2001
From: Rachael Booth <rachael.booth@softwire.com>
Date: Tue, 14 Jan 2025 11:27:57 +0000
Subject: [PATCH] Remove 2023 options

---
 .../form/lettings/questions/sheltered.rb       |  9 +--------
 .../form/lettings/questions/sheltered_spec.rb  | 18 ------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/app/models/form/lettings/questions/sheltered.rb b/app/models/form/lettings/questions/sheltered.rb
index 9127dfa6f..65e13d864 100644
--- a/app/models/form/lettings/questions/sheltered.rb
+++ b/app/models/form/lettings/questions/sheltered.rb
@@ -15,7 +15,7 @@ class Form::Lettings::Questions::Sheltered < ::Form::Question
         "3" => { "value" => "No" },
         "divider" => { "value" => true },
         "4" => { "value" => "Don’t know" } }
-    elsif form.start_year_2024_or_later?
+    else
       { "1" => { "value" => "Yes – specialist retirement housing" },
         "2" => { "value" => "Yes – extra care housing" },
         "5" => { "value" => "Yes – sheltered housing for adults aged under 55 years" },
@@ -23,13 +23,6 @@ class Form::Lettings::Questions::Sheltered < ::Form::Question
         "3" => { "value" => "No" },
         "divider" => { "value" => true },
         "4" => { "value" => "Don’t know" } }
-    else
-      { "2" => { "value" => "Yes – extra care housing" },
-        "1" => { "value" => "Yes – specialist retirement housing" },
-        "5" => { "value" => "Yes – sheltered housing for adults aged under 55 years" },
-        "3" => { "value" => "No" },
-        "divider" => { "value" => true },
-        "4" => { "value" => "Don’t know" } }
     end
   end
 
diff --git a/spec/models/form/lettings/questions/sheltered_spec.rb b/spec/models/form/lettings/questions/sheltered_spec.rb
index 00d145bf5..429b8a725 100644
--- a/spec/models/form/lettings/questions/sheltered_spec.rb
+++ b/spec/models/form/lettings/questions/sheltered_spec.rb
@@ -25,24 +25,6 @@ RSpec.describe Form::Lettings::Questions::Sheltered, type: :model do
     expect(question.type).to eq "radio"
   end
 
-  context "with 2023/24 form" do
-    before do
-      allow(form).to receive(:start_year_2024_or_later?).and_return(false)
-      allow(form).to receive(:start_year_2025_or_later?).and_return(false)
-    end
-
-    it "has the correct answer_options" do
-      expect(question.answer_options).to eq({
-        "2" => { "value" => "Yes – extra care housing" },
-        "1" => { "value" => "Yes – specialist retirement housing" },
-        "5" => { "value" => "Yes – sheltered housing for adults aged under 55 years" },
-        "3" => { "value" => "No" },
-        "divider" => { "value" => true },
-        "4" => { "value" => "Don’t know" },
-      })
-    end
-  end
-
   context "with 2024/25 form" do
     before do
       allow(form).to receive(:start_year_2024_or_later?).and_return(true)