diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb index 55c442c0d..406ce9e9c 100644 --- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb @@ -1444,10 +1444,11 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do let(:affiliated_org) { create(:organisation, :with_old_visible_id) } let(:unaffiliated_user) { create(:user, organisation: create(:organisation)) } let(:attributes) { { bulk_upload:, field_1: affiliated_org.old_visible_id } } + let(:organisation_id) { unaffiliated_user.organisation_id } before do create(:organisation_relationship, parent_organisation: owning_org, child_organisation: affiliated_org) - bulk_upload.update!(organisation_id: affiliated_org.id, user: unaffiliated_user) + bulk_upload.update!(organisation_id:, user: unaffiliated_user) end it "blocks log creation and adds an error to field_1" do @@ -1462,10 +1463,11 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do let(:affiliated_org) { create(:organisation, :with_old_visible_id) } let(:unaffiliated_support_user) { create(:user, :support, organisation: create(:organisation)) } let(:attributes) { { bulk_upload:, field_1: affiliated_org.old_visible_id } } + let(:organisation_id) { affiliated_org.id } before do create(:organisation_relationship, parent_organisation: owning_org, child_organisation: affiliated_org) - bulk_upload.update!(organisation_id: affiliated_org.id, user: unaffiliated_support_user) + bulk_upload.update!(organisation_id:, user: unaffiliated_support_user) end it "does not block log creation and does not add an error to field_1" do diff --git a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb index 50b20bb5e..5c9df8c7d 100644 --- a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb @@ -559,10 +559,11 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do let(:affiliated_org) { create(:organisation, :with_old_visible_id) } let(:unaffiliated_user) { create(:user, organisation: create(:organisation)) } let(:attributes) { { bulk_upload:, field_1: affiliated_org.old_visible_id } } + let(:organisation_id) { unaffiliated_user.organisation_id } before do create(:organisation_relationship, parent_organisation: owning_org, child_organisation: affiliated_org) - bulk_upload.update!(organisation_id: affiliated_org.id, user: unaffiliated_user) + bulk_upload.update!(organisation_id:, user: unaffiliated_user) end it "blocks log creation and adds an error to field_1" do @@ -577,10 +578,11 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do let(:affiliated_org) { create(:organisation, :with_old_visible_id) } let(:unaffiliated_support_user) { create(:user, :support, organisation: create(:organisation)) } let(:attributes) { { bulk_upload:, field_1: affiliated_org.old_visible_id } } + let(:organisation_id) { affiliated_org.id } before do create(:organisation_relationship, parent_organisation: owning_org, child_organisation: affiliated_org) - bulk_upload.update!(organisation_id: affiliated_org.id, user: unaffiliated_support_user) + bulk_upload.update!(organisation_id:, user: unaffiliated_support_user) end it "does not block log creation and does not add an error to field_1" do