diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb index d731737de..104c31c05 100644 --- a/app/controllers/bulk_upload_lettings_logs_controller.rb +++ b/app/controllers/bulk_upload_lettings_logs_controller.rb @@ -28,7 +28,7 @@ private end def in_crossover_period? - FormHandler.instance.in_crossover_period? + FormHandler.instance.lettings_in_crossover_period? end def form diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb index d0064d994..5f9b8d9a6 100644 --- a/app/controllers/bulk_upload_sales_logs_controller.rb +++ b/app/controllers/bulk_upload_sales_logs_controller.rb @@ -28,7 +28,7 @@ private end def in_crossover_period? - FormHandler.instance.in_crossover_period? + FormHandler.instance.sales_in_crossover_period? end def form diff --git a/app/models/form_handler.rb b/app/models/form_handler.rb index 8b29d517d..69b05859e 100644 --- a/app/models/form_handler.rb +++ b/app/models/form_handler.rb @@ -67,18 +67,18 @@ class FormHandler lettings_in_crossover_period?(now:) || sales_in_crossover_period?(now:) end -private - - def lettings_in_crossover_period?(now:) + def lettings_in_crossover_period?(now: Time.zone.now) forms = lettings_forms.values forms.count { |form| form.start_date < now && now < form.end_date } > 1 end - def sales_in_crossover_period?(now:) + def sales_in_crossover_period?(now: Time.zone.now) forms = sales_forms.values forms.count { |form| form.start_date < now && now < form.end_date } > 1 end +private + def get_all_forms lettings_forms.merge(sales_forms) end diff --git a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb index 1a3326257..4e2c9b9a6 100644 --- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb @@ -38,7 +38,7 @@ module Forms private def in_crossover_period? - FormHandler.instance.in_crossover_period? + FormHandler.instance.lettings_in_crossover_period? end end end diff --git a/app/models/forms/bulk_upload_sales/prepare_your_file.rb b/app/models/forms/bulk_upload_sales/prepare_your_file.rb index b096e2700..5c7e775ef 100644 --- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb @@ -38,7 +38,7 @@ module Forms private def in_crossover_period? - FormHandler.instance.in_crossover_period? + FormHandler.instance.sales_in_crossover_period? end end end diff --git a/spec/features/bulk_upload_lettings_logs_spec.rb b/spec/features/bulk_upload_lettings_logs_spec.rb index dcbf15e56..3df49fe44 100644 --- a/spec/features/bulk_upload_lettings_logs_spec.rb +++ b/spec/features/bulk_upload_lettings_logs_spec.rb @@ -22,7 +22,7 @@ RSpec.describe "Bulk upload lettings log" do # rubocop:disable RSpec/AnyInstance context "when during crossover period" do it "shows journey with year option" do - Timecop.freeze(2023, 6, 1) do + Timecop.freeze(2022, 6, 1) do visit("/lettings-logs") expect(page).to have_link("Upload lettings logs in bulk") click_link("Upload lettings logs in bulk") diff --git a/spec/features/bulk_upload_sales_logs_spec.rb b/spec/features/bulk_upload_sales_logs_spec.rb index 67356b1ee..b69b6e237 100644 --- a/spec/features/bulk_upload_sales_logs_spec.rb +++ b/spec/features/bulk_upload_sales_logs_spec.rb @@ -22,7 +22,7 @@ RSpec.describe "Bulk upload sales log" do # rubocop:disable RSpec/AnyInstance context "when during crossover period" do it "shows journey with year option" do - Timecop.freeze(2023, 6, 1) do + Timecop.freeze(2023, 5, 1) do visit("/sales-logs") expect(page).to have_link("Upload sales logs in bulk") click_link("Upload sales logs in bulk") diff --git a/spec/requests/bulk_upload_lettings_logs_controller_spec.rb b/spec/requests/bulk_upload_lettings_logs_controller_spec.rb index 3b59d449d..8b9d091ca 100644 --- a/spec/requests/bulk_upload_lettings_logs_controller_spec.rb +++ b/spec/requests/bulk_upload_lettings_logs_controller_spec.rb @@ -23,7 +23,7 @@ RSpec.describe BulkUploadLettingsLogsController, type: :request do context "when in crossover period" do it "redirects to /year" do - Timecop.freeze(2023, 6, 1) do + Timecop.freeze(2022, 6, 1) do get "/lettings-logs/bulk-upload-logs/start", params: {} expect(response).to redirect_to("/lettings-logs/bulk-upload-logs/year")