From 5f0dc53aed34766acf3b6ceace1ed47334c9d6c8 Mon Sep 17 00:00:00 2001 From: Kat <54268893+kosiakkatrina@users.noreply.github.com> Date: Tue, 4 Feb 2025 09:02:51 +0000 Subject: [PATCH] Update sales factory --- spec/factories/sales_log.rb | 1 - spec/models/location_spec.rb | 8 ++------ spec/models/sales_log_spec.rb | 2 +- spec/models/scheme_spec.rb | 5 +---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index 40facd2d6..820c99fdc 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -80,7 +80,6 @@ FactoryBot.define do noint { 2 } privacynotice { 1 } age1_known { 0 } - staircase { 1 } age1 { Faker::Number.within(range: 27..45) } sex1 { %w[F M X R].sample } national { 18 } diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb index 1049da703..254e7d8a6 100644 --- a/spec/models/location_spec.rb +++ b/spec/models/location_spec.rb @@ -1018,18 +1018,14 @@ RSpec.describe Location, type: :model do it "returns reactivating soon if the location has a future reactivation date" do deactivation_period = FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.yesterday, reactivation_date: Time.zone.tomorrow, location:) location.save! - # expect(Time.zone.today).to eq(Time.zone.local(2025, 2, 3).to_date) - # expect(deactivation_period.deactivation_date).to eq(Time.zone.local(2025, 2, 2).to_date) - # expect(deactivation_period.reactivation_date).to eq(Time.zone.local(2025, 2, 4).to_date) + expect(deactivation_period.deactivation_date).to eq(Time.zone.yesterday.to_date) expect(location.status).to eq(:reactivating_soon) end it "returns reactivating soon if the location had a deactivation during another deactivation" do deactivation_period = FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.today - 1.month, reactivation_date: Time.zone.today + 2.days, location:) location.save! - # expect(Time.zone.today).to eq(Time.zone.local(2025, 2, 3).to_date) - # expect(deactivation_period.deactivation_date).to eq(Time.zone.local(2025, 1, 3).to_date) - # expect(deactivation_period.reactivation_date).to eq(Time.zone.local(2025, 2, 5).to_date) + expect(deactivation_period.deactivation_date).to eq((Time.zone.today - 1.month).to_date) expect(location.status).to eq(:reactivating_soon) end diff --git a/spec/models/sales_log_spec.rb b/spec/models/sales_log_spec.rb index 70ac5455f..c36884b8d 100644 --- a/spec/models/sales_log_spec.rb +++ b/spec/models/sales_log_spec.rb @@ -886,7 +886,7 @@ RSpec.describe SalesLog, type: :model do end describe "expected_shared_ownership_deposit_value" do - let!(:completed_sales_log) { create(:sales_log, :completed, ownershipsch: 1, type: 2, value: 1000, equity: 50) } + let!(:completed_sales_log) { create(:sales_log, :completed, ownershipsch: 1, type: 2, value: 1000, equity: 50, staircase: 1) } it "is set to completed for a completed sales log" do expect(completed_sales_log.expected_shared_ownership_deposit_value).to eq(500) diff --git a/spec/models/scheme_spec.rb b/spec/models/scheme_spec.rb index 1d12ed5bd..a0132f85b 100644 --- a/spec/models/scheme_spec.rb +++ b/spec/models/scheme_spec.rb @@ -435,10 +435,7 @@ RSpec.describe Scheme, type: :model do it "returns reactivating soon if the scheme had a deactivation during another deactivation" do deactivation_period = FactoryBot.create(:scheme_deactivation_period, deactivation_date: Time.zone.today - 2.months, reactivation_date: Time.zone.today + 2.days, scheme:) scheme.save! - scheme.reload - # expect(Time.zone.today).to eq(Time.zone.local(2025, 2, 3).to_date) - # expect(deactivation_period.deactivation_date).to eq(Time.zone.local(2024, 12, 3).to_date) - # expect(deactivation_period.reactivation_date).to eq(Time.zone.local(2025, 2, 5).to_date) + expect(deactivation_period.deactivation_date).to eq((Time.zone.today - 2.months).to_date) expect(scheme.status).to eq(:reactivating_soon) end