diff --git a/spec/helpers/tasklist_helper_spec.rb b/spec/helpers/tasklist_helper_spec.rb index 5d75616ec..aff94eb36 100644 --- a/spec/helpers/tasklist_helper_spec.rb +++ b/spec/helpers/tasklist_helper_spec.rb @@ -81,7 +81,7 @@ RSpec.describe TasklistHelper do context "with sales log" do context "when collection_period_open? == true" do let(:now) { Time.utc(2022, 6, 1) } - let(:sales_log) { create(:sales_log, :completed) } + let(:sales_log) { create(:sales_log, :completed, saledate: now) } it "returns relevant text" do expect(review_log_text(sales_log)).to eq( @@ -92,7 +92,7 @@ RSpec.describe TasklistHelper do context "when collection_period_open? == false" do let(:now) { Time.utc(2022, 6, 1) } - let!(:sales_log) { create(:sales_log, :completed) } + let!(:sales_log) { create(:sales_log, :completed, saledate: now) } it "returns relevant text" do Timecop.freeze(now + 1.year) do diff --git a/spec/models/sales_log_spec.rb b/spec/models/sales_log_spec.rb index 7f6c74fc4..04a1d90e8 100644 --- a/spec/models/sales_log_spec.rb +++ b/spec/models/sales_log_spec.rb @@ -296,7 +296,7 @@ RSpec.describe SalesLog, type: :model do WebMock.stub_request(:get, /api.postcodes.io\/postcodes\/CA101AA/) .to_return(status: 200, body: '{"status":200,"result":{"admin_district":"Eden","codes":{"admin_district":"E07000030"}}}', headers: {}) - Timecop.freeze(2023, 4, 1) + Timecop.freeze(2023, 5, 2) Singleton.__init__(FormHandler) end diff --git a/spec/models/validations/sales/sale_information_validations_spec.rb b/spec/models/validations/sales/sale_information_validations_spec.rb index fb9500956..7670f19ba 100644 --- a/spec/models/validations/sales/sale_information_validations_spec.rb +++ b/spec/models/validations/sales/sale_information_validations_spec.rb @@ -115,10 +115,10 @@ RSpec.describe Validations::Sales::SaleInformationValidations do sale_information_validator.validate_exchange_date(record) expect(record.errors[:exdate]).to eq( - ["Contract exchange date must be less than 1 year before completion date"], + ["Contract exchange date must be less than 1 year before sale completion date"], ) expect(record.errors[:saledate]).to eq( - ["Completion date must be less than 1 year after contract exchange date"], + ["Sale completion date must be less than 1 year after contract exchange date"], ) end end @@ -130,10 +130,10 @@ RSpec.describe Validations::Sales::SaleInformationValidations do sale_information_validator.validate_exchange_date(record) expect(record.errors[:exdate]).to eq( - ["Contract exchange date must be before completion date"], + ["Contract exchange date must be before sale completion date"], ) expect(record.errors[:saledate]).to eq( - ["Completion date must be after contract exchange date"], + ["Sale completion date must be after contract exchange date"], ) end end diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb index 0a7ca0790..14341cd33 100644 --- a/spec/requests/sales_logs_controller_spec.rb +++ b/spec/requests/sales_logs_controller_spec.rb @@ -238,17 +238,28 @@ RSpec.describe SalesLogsController, type: :request do Timecop.return end + before do + Timecop.freeze(2022, 4, 1) + sales_log_2022.update!(saledate: Time.zone.local(2022, 4, 1)) + Timecop.freeze(2023, 1, 1) + sales_log_2022.update!(saledate: Time.zone.local(2023, 1, 1)) + end + + after do + Timecop.unfreeze + end + let!(:sales_log_2022) do FactoryBot.create(:sales_log, :completed, owning_organisation: organisation, - saledate: Time.zone.local(2022, 4, 1), - created_by: user) + created_by: user, + saledate: Time.zone.today) end let!(:sales_log_2023) do FactoryBot.create(:sales_log, owning_organisation: organisation, - saledate: Time.zone.local(2023, 1, 1), - created_by: user) + created_by: user, + saledate: Time.zone.today) end it "shows sales logs for multiple selected statuses and years" do