diff --git a/app/models/forms/bulk_upload_lettings/guidance.rb b/app/models/forms/bulk_upload_lettings/guidance.rb index 24bc531f2..66e4ccd74 100644 --- a/app/models/forms/bulk_upload_lettings/guidance.rb +++ b/app/models/forms/bulk_upload_lettings/guidance.rb @@ -4,11 +4,18 @@ module Forms include ActiveModel::Model include ActiveModel::Attributes include Rails.application.routes.url_helpers + include CollectionTimeHelper attribute :year, :integer attribute :referrer attribute :organisation_id, :integer + def initialize(params) + super(params) + + self.year = current_collection_start_year if year.nil? + end + def view_path "bulk_upload_shared/guidance" end diff --git a/app/models/forms/bulk_upload_sales/guidance.rb b/app/models/forms/bulk_upload_sales/guidance.rb index ef792a3e4..400f633f6 100644 --- a/app/models/forms/bulk_upload_sales/guidance.rb +++ b/app/models/forms/bulk_upload_sales/guidance.rb @@ -4,11 +4,18 @@ module Forms include ActiveModel::Model include ActiveModel::Attributes include Rails.application.routes.url_helpers + include CollectionTimeHelper attribute :year, :integer attribute :referrer attribute :organisation_id, :integer + def initialize(params) + super(params) + + self.year = current_collection_start_year if year.nil? + end + def view_path "bulk_upload_shared/guidance" end diff --git a/spec/models/forms/bulk_upload_lettings/guidance_spec.rb b/spec/models/forms/bulk_upload_lettings/guidance_spec.rb index 271ff8b27..94f187e00 100644 --- a/spec/models/forms/bulk_upload_lettings/guidance_spec.rb +++ b/spec/models/forms/bulk_upload_lettings/guidance_spec.rb @@ -6,6 +6,7 @@ RSpec.describe Forms::BulkUploadLettings::Guidance do subject(:bu_guidance) { described_class.new(year:, referrer:) } let(:year) { 2024 } + let(:referrer) { nil } describe "#back_path" do context "when referrer is prepare-your-file" do @@ -40,4 +41,18 @@ RSpec.describe Forms::BulkUploadLettings::Guidance do end end end + + describe "year" do + context "when year is not provided" do + let(:year) { nil } + + before do + allow_any_instance_of(CollectionTimeHelper).to receive(:current_collection_start_year).and_return(2030) + end + + it "is set to the current collection start year" do + expect(bu_guidance.year).to eq(2030) + end + end + end end diff --git a/spec/models/forms/bulk_upload_sales/guidance_spec.rb b/spec/models/forms/bulk_upload_sales/guidance_spec.rb index 6eacf6d0c..a1fb3dda0 100644 --- a/spec/models/forms/bulk_upload_sales/guidance_spec.rb +++ b/spec/models/forms/bulk_upload_sales/guidance_spec.rb @@ -6,6 +6,7 @@ RSpec.describe Forms::BulkUploadSales::Guidance do subject(:bu_guidance) { described_class.new(year:, referrer:) } let(:year) { 2024 } + let(:referrer) { nil } describe "#back_path" do context "when referrer is prepare-your-file" do @@ -40,4 +41,18 @@ RSpec.describe Forms::BulkUploadSales::Guidance do end end end + + describe "year" do + context "when year is not provided" do + let(:year) { nil } + + before do + allow_any_instance_of(CollectionTimeHelper).to receive(:current_collection_start_year).and_return(2030) + end + + it "is set to the current collection start year" do + expect(bu_guidance.year).to eq(2030) + end + end + end end