From bc422022ff84e10232f4c038b0146623549ef71e Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Tue, 4 Feb 2025 11:39:55 +0000 Subject: [PATCH] Update sales factory and location tests (#2927) * Check deactivation period dates * Check location deactivation dates * Comment out the date checks * Update sales factory * Update create database for accessibility tests * Fix date tests --- .github/workflows/run_tests.yml | 2 +- spec/factories/sales_log.rb | 1 - spec/models/location_spec.rb | 7 ++++--- spec/models/sales_log_spec.rb | 2 +- spec/models/scheme_spec.rb | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index c23dc51c9..fde032a69 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -369,7 +369,7 @@ jobs: - name: Create database run: | - bundle exec rake parallel:setup + bundle exec rake db:prepare - name: Compile assets run: | 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 2d3bf317b..6d876381d 100644 --- a/spec/models/location_spec.rb +++ b/spec/models/location_spec.rb @@ -1016,15 +1016,16 @@ RSpec.describe Location, type: :model do end it "returns reactivating soon if the location has a future reactivation date" do - FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.yesterday, reactivation_date: Time.zone.tomorrow, location:) + deactivation_period = FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.yesterday, reactivation_date: Time.zone.tomorrow, location:) location.save! + expect(deactivation_period.deactivation_date).to eq(Time.zone.yesterday) expect(location.status).to eq(:reactivating_soon) end it "returns reactivating soon if the location had a deactivation during another deactivation" do - FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.today - 1.month, reactivation_date: Time.zone.today + 2.days, location:) + deactivation_period = FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.today - 1.month, reactivation_date: Time.zone.today + 2.days, location:) location.save! - location.reload + expect(deactivation_period.deactivation_date).to eq(Time.zone.today - 1.month) 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 65de49f7d..a0afad6fa 100644 --- a/spec/models/scheme_spec.rb +++ b/spec/models/scheme_spec.rb @@ -433,9 +433,9 @@ RSpec.describe Scheme, type: :model do end it "returns reactivating soon if the scheme had a deactivation during another deactivation" do - FactoryBot.create(:scheme_deactivation_period, deactivation_date: Time.zone.today - 2.months, reactivation_date: Time.zone.today + 2.days, scheme:) + 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(deactivation_period.deactivation_date).to eq(Time.zone.today - 2.months) expect(scheme.status).to eq(:reactivating_soon) end