force crossover period

app/controllers/bulk_upload_lettings_logs_controller.rb

@@ -33,6 +33,8 @@ private
   end
 
   def in_crossover_period?
+    return true if FeatureToggle.force_crossover?
+
     FormHandler.instance.lettings_in_crossover_period?
   end
 

app/models/forms/bulk_upload_lettings/prepare_your_file.rb

@@ -44,6 +44,8 @@ module Forms
     private
 
       def in_crossover_period?
+        return true if FeatureToggle.force_crossover?
+
         FormHandler.instance.lettings_in_crossover_period?
       end
     end

app/models/forms/bulk_upload_lettings/year.rb

@@ -34,7 +34,10 @@ module Forms
     private
 
       def possible_years
-        [FormHandler.instance.lettings_forms["current_lettings"].start_date.year, FormHandler.instance.lettings_forms["previous_lettings"].start_date.year]
+        [
+          FormHandler.instance.lettings_forms["next_lettings"].start_date.year,
+          FormHandler.instance.lettings_forms["current_lettings"].start_date.year,
+        ]
       end
     end
   end

config/initializers/feature_toggle.rb

@@ -40,6 +40,12 @@ class FeatureToggle
     !Rails.env.development?
   end
 
+  def self.force_crossover?
+    return false if Rails.env.test?
+
+    !Rails.env.production?
+  end
+
   def self.validate_valid_radio_options?
     !(Rails.env.production? || Rails.env.staging?)
   end

spec/models/forms/bulk_upload_lettings/year_spec.rb

@@ -5,8 +5,8 @@ RSpec.describe Forms::BulkUploadLettings::Year do
 
   describe "#options" do
     it "returns correct years" do
-      expect(form.options.map(&:id)).to eql([2022, 2021])
-      expect(form.options.map(&:name)).to eql(%w[2022/2023 2021/2022])
+      expect(form.options.map(&:id)).to eql([2023, 2022])
+      expect(form.options.map(&:name)).to eql(%w[2023/2024 2022/2023])
     end
   end
 end