From 28c5f54e326e4b76f1bb3e2a7a96e87737d7bcc1 Mon Sep 17 00:00:00 2001 From: samyou-softwire Date: Thu, 2 Apr 2026 12:19:45 +0100 Subject: [PATCH] CLDC-4363: Update collection resources controller spec --- app/helpers/collection_time_helper.rb | 4 ++++ spec/requests/collection_resources_controller_spec.rb | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/helpers/collection_time_helper.rb b/app/helpers/collection_time_helper.rb index 93852c597..acd9cf7a5 100644 --- a/app/helpers/collection_time_helper.rb +++ b/app/helpers/collection_time_helper.rb @@ -29,6 +29,10 @@ module CollectionTimeHelper Time.zone.local(current_collection_start_year, 4, 1) end + def current_collection_after_crossover_start_date + Form::DEADLINES[current_collection_start_year][:edit_end_date] + 1.day + end + def collection_end_date(date) Time.zone.local(collection_start_year_for_date(date) + 1, 3, 31).end_of_day end diff --git a/spec/requests/collection_resources_controller_spec.rb b/spec/requests/collection_resources_controller_spec.rb index bc7468213..a7d9e301a 100644 --- a/spec/requests/collection_resources_controller_spec.rb +++ b/spec/requests/collection_resources_controller_spec.rb @@ -734,7 +734,7 @@ RSpec.describe CollectionResourcesController, type: :request do end describe "GET #edit_additional_collection_resource" do - let(:collection_resource) { create(:collection_resource, :additional, year: 2025, log_type: "sales", short_display_name: "additional resource", download_filename: "additional.pdf") } + let(:collection_resource) { create(:collection_resource, :additional, year: current_collection_start_year, log_type: "sales", short_display_name: "additional resource", download_filename: "additional.pdf") } context "when user is not signed in" do it "redirects to the sign in page" do @@ -773,7 +773,7 @@ RSpec.describe CollectionResourcesController, type: :request do let(:user) { create(:user, :support) } before do - allow(Time.zone).to receive(:today).and_return(Time.zone.local(2025, 1, 8)) + allow(Time.zone).to receive(:today).and_return(current_collection_after_crossover_start_date) allow(user).to receive(:need_two_factor_authentication?).and_return(false) sign_in user end @@ -786,7 +786,7 @@ RSpec.describe CollectionResourcesController, type: :request do it "displays update collection resources page content" do get collection_resource_edit_path(collection_resource) - expect(page).to have_content("Sales 2025 to 2026") + expect(page).to have_content("Sales #{current_collection_start_year} to #{current_collection_end_year}") expect(page).to have_content("Change the additional resource") expect(page).to have_content("This file will be available for all users to download.") expect(page).to have_content("Upload file")