From 4e5dbbf284c3dd31a0791d0d090f2a7fa6c39af3 Mon Sep 17 00:00:00 2001 From: Samuel Date: Fri, 6 Jun 2025 16:02:44 +0100 Subject: [PATCH] fixup! add a verifying test clarify test structure --- spec/services/merge/merge_organisations_service_spec.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spec/services/merge/merge_organisations_service_spec.rb b/spec/services/merge/merge_organisations_service_spec.rb index 432c2765f..de98894b7 100644 --- a/spec/services/merge/merge_organisations_service_spec.rb +++ b/spec/services/merge/merge_organisations_service_spec.rb @@ -715,12 +715,16 @@ RSpec.describe Merge::MergeOrganisationsService do create(:location, scheme:) incomplete_lettings_log = build(:lettings_log, scheme:, owning_organisation: merging_organisation, startdate: Time.zone.today) incomplete_lettings_log.save!(validate: false) - expect(Rails.logger).not_to receive(:error) + # if the location is overwritten with the nil one above, it will fail validation + # since a rollback will occur incomplete_lettings_log will not change so there's nothing to verify later + # so instead we verify that no rollback occurs + expect(Rails.logger).not_to receive(:error) merge_organisations_service.call incomplete_lettings_log.reload + # also ensure it wasn't overwritten with a valid location expect(incomplete_lettings_log.location).to be_nil end