From ae23749ae83faf84213c8ef6c37701398991acac Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Wed, 17 Jul 2024 11:59:12 +0100 Subject: [PATCH] Update BU log creator specs for 2024 --- .../bulk_upload/lettings/log_creator_spec.rb | 36 +++---------------- .../bulk_upload/sales/log_creator_spec.rb | 34 ++++++++---------- 2 files changed, 18 insertions(+), 52 deletions(-) diff --git a/spec/services/bulk_upload/lettings/log_creator_spec.rb b/spec/services/bulk_upload/lettings/log_creator_spec.rb index 85cf310f6..fe8e72127 100644 --- a/spec/services/bulk_upload/lettings/log_creator_spec.rb +++ b/spec/services/bulk_upload/lettings/log_creator_spec.rb @@ -6,13 +6,13 @@ RSpec.describe BulkUpload::Lettings::LogCreator do let(:owning_org) { create(:organisation, old_visible_id: 123, rent_periods: [2]) } let(:user) { create(:user, organisation: owning_org) } - let(:bulk_upload) { create(:bulk_upload, :lettings, user:) } - let(:csv_parser) { instance_double(BulkUpload::Lettings::Year2023::CsvParser) } - let(:row_parser) { instance_double(BulkUpload::Lettings::Year2023::RowParser) } + let(:bulk_upload) { create(:bulk_upload, :lettings, user:, year: 2024) } + let(:csv_parser) { instance_double(BulkUpload::Lettings::Year2024::CsvParser) } + let(:row_parser) { instance_double(BulkUpload::Lettings::Year2024::RowParser) } let(:log) { build(:lettings_log, :completed, assigned_to: user, owning_organisation: owning_org, managing_organisation: owning_org) } before do - allow(BulkUpload::Lettings::Year2023::CsvParser).to receive(:new).and_return(csv_parser) + allow(BulkUpload::Lettings::Year2024::CsvParser).to receive(:new).and_return(csv_parser) allow(csv_parser).to receive(:row_parsers).and_return([row_parser]) allow(row_parser).to receive(:log).and_return(log) allow(row_parser).to receive(:bulk_upload=).and_return(true) @@ -20,23 +20,7 @@ RSpec.describe BulkUpload::Lettings::LogCreator do allow(row_parser).to receive(:blank_row?).and_return(false) end - around do |example| - Timecop.freeze(Time.zone.local(2023, 4, 1)) do - Singleton.__init__(FormHandler) - example.run - end - end - describe "#call" do - before do - Timecop.freeze(Time.zone.local(2023, 11, 10)) - Singleton.__init__(FormHandler) - end - - after do - Timecop.return - end - context "when a valid csv with new log" do it "creates a new log" do expect { service.call }.to change(LettingsLog, :count) @@ -77,17 +61,11 @@ RSpec.describe BulkUpload::Lettings::LogCreator do build( :lettings_log, :completed, - renttype: 3, age1_known: 0, age1: 5, owning_organisation: owning_org, managing_organisation: owning_org, assigned_to: user, - national: 18, - waityear: 9, - joint: 2, - tenancy: 9, - ppcodenk: 1, ) end @@ -148,18 +126,12 @@ RSpec.describe BulkUpload::Lettings::LogCreator do build( :lettings_log, :completed, - renttype: 3, age1: 22, age1_known: 0, ecstat1: 5, owning_organisation: owning_org, managing_organisation: owning_org, assigned_to: user, - national: 18, - waityear: 9, - joint: 2, - tenancy: 9, - ppcodenk: 1, ) end diff --git a/spec/services/bulk_upload/sales/log_creator_spec.rb b/spec/services/bulk_upload/sales/log_creator_spec.rb index 4c3c38bbb..ccf9efae5 100644 --- a/spec/services/bulk_upload/sales/log_creator_spec.rb +++ b/spec/services/bulk_upload/sales/log_creator_spec.rb @@ -6,13 +6,13 @@ RSpec.describe BulkUpload::Sales::LogCreator do let(:owning_org) { create(:organisation, old_visible_id: 123) } let(:user) { create(:user, organisation: owning_org) } - let(:bulk_upload) { create(:bulk_upload, :sales, user:) } - let(:csv_parser) { instance_double(BulkUpload::Sales::Year2023::CsvParser) } - let(:row_parser) { instance_double(BulkUpload::Sales::Year2023::RowParser) } + let(:bulk_upload) { create(:bulk_upload, :sales, user:, year: 2024) } + let(:csv_parser) { instance_double(BulkUpload::Sales::Year2024::CsvParser) } + let(:row_parser) { instance_double(BulkUpload::Sales::Year2024::RowParser) } let(:log) { build(:sales_log, :completed, assigned_to: user, owning_organisation: owning_org, managing_organisation: owning_org) } before do - allow(BulkUpload::Sales::Year2023::CsvParser).to receive(:new).and_return(csv_parser) + allow(BulkUpload::Sales::Year2024::CsvParser).to receive(:new).and_return(csv_parser) allow(csv_parser).to receive(:row_parsers).and_return([row_parser]) allow(row_parser).to receive(:log).and_return(log) allow(row_parser).to receive(:bulk_upload=).and_return(true) @@ -21,13 +21,6 @@ RSpec.describe BulkUpload::Sales::LogCreator do end describe "#call" do - around do |example| - Timecop.freeze(Time.zone.local(2023, 4, 22)) do - Singleton.__init__(FormHandler) - example.run - end - end - context "when a valid csv with new log" do it "creates a new log" do expect { service.call }.to change(SalesLog, :count) @@ -92,14 +85,15 @@ RSpec.describe BulkUpload::Sales::LogCreator do build( :sales_log, :completed, - ownershipsch: 2, - pcodenk: 0, - ppcodenk: 0, - postcode_full: "AA11AA", - ppostcode_full: "BB22BB", owning_organisation: owning_org, assigned_to: user, managing_organisation: owning_org, + ownershipsch: 2, + value: 200_000, + deposit: 10_000, + mortgageused: 1, + mortgage: 100_000, + grant: 10_000 ) end @@ -111,10 +105,10 @@ RSpec.describe BulkUpload::Sales::LogCreator do service.call record = SalesLog.last - expect(record.pcodenk).to be_blank - expect(record.postcode_full).to be_blank - expect(record.ppcodenk).to be_blank - expect(record.ppostcode_full).to be_blank + expect(record.value).to be_blank + expect(record.deposit).to be_blank + expect(record.mortgage).to be_blank + expect(record.grant).to be_blank end end