diff --git a/spec/factories/lettings_log.rb b/spec/factories/lettings_log.rb index ae5d9bc95..b0667b817 100644 --- a/spec/factories/lettings_log.rb +++ b/spec/factories/lettings_log.rb @@ -3,7 +3,6 @@ FactoryBot.define do created_by { FactoryBot.create(:user) } owning_organisation { created_by.organisation } managing_organisation { created_by.organisation } - startdate { Time.zone.today } trait :about_completed do renewal { 0 } needstype { 1 } @@ -18,6 +17,7 @@ FactoryBot.define do age2 { 19 } renewal { 1 } rent_type { 1 } + startdate { Time.zone.today } end trait :soft_validations_triggered do status { 1 } @@ -35,6 +35,7 @@ FactoryBot.define do hhmemb { 1 } end trait :completed do + startdate { Time.zone.today } status { 2 } tenancycode { Faker::Name.initials(number: 10) } age1_known { 0 } @@ -65,7 +66,7 @@ FactoryBot.define do rsnvac { 6 } unittype_gn { 7 } beds { 3 } - voiddate { "03/11/2019" } + voiddate { 2.days.ago } offered { 2 } wchair { 1 } earnings { 68 } @@ -131,7 +132,7 @@ FactoryBot.define do hbrentshortfall { 1 } tshortfall { 12 } property_relet { 0 } - mrcdate { Time.zone.yesterday } + mrcdate { 1.day.ago } incref { 0 } armedforces { 1 } builtype { 1 } diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb index c1bfafb57..5377dfe37 100644 --- a/spec/models/lettings_log_spec.rb +++ b/spec/models/lettings_log_spec.rb @@ -9,6 +9,11 @@ RSpec.describe LettingsLog do before do allow(FormHandler.instance).to receive(:current_lettings_form).and_return(fake_2021_2022_form) + Timecop.freeze(Time.zone.local(2022, 1, 1)) + end + + after do + Timecop.unfreeze end include_examples "shared examples for derived fields", :lettings_log @@ -2404,8 +2409,8 @@ RSpec.describe LettingsLog do end describe "scopes" do - let!(:lettings_log_1) { FactoryBot.create(:lettings_log, :in_progress, startdate: Time.utc(2021, 5, 3), created_by: created_by_user) } - let!(:lettings_log_2) { FactoryBot.create(:lettings_log, :completed, startdate: Time.utc(2021, 5, 3), created_by: created_by_user) } + let!(:lettings_log_1) { FactoryBot.create(:lettings_log, :in_progress, startdate: Time.utc(2021, 5, 3), mrcdate: Time.utc(2021, 5, 3), voiddate: Time.utc(2021, 5, 3), created_by: created_by_user) } + let!(:lettings_log_2) { FactoryBot.create(:lettings_log, :completed, startdate: Time.utc(2021, 5, 3), mrcdate: Time.utc(2021, 5, 3), voiddate: Time.utc(2021, 5, 3), created_by: created_by_user) } before do Timecop.freeze(Time.utc(2022, 6, 3))