From 5e361029423756f82affdbc4968175e1818ee4fa Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Thu, 5 Feb 2026 09:00:10 +0000 Subject: [PATCH] CLDC-NONE: Get scheme by name rather than array position --- spec/services/merge/merge_organisations_service_spec.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spec/services/merge/merge_organisations_service_spec.rb b/spec/services/merge/merge_organisations_service_spec.rb index 3f0ee4b1c..fa6b47519 100644 --- a/spec/services/merge/merge_organisations_service_spec.rb +++ b/spec/services/merge/merge_organisations_service_spec.rb @@ -1582,9 +1582,11 @@ RSpec.describe Merge::MergeOrganisationsService do owned_lettings_log_no_location.reload expect(new_absorbing_organisation.owned_lettings_logs.count).to eq(2) expect(new_absorbing_organisation.managed_lettings_logs.count).to eq(1) - expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(new_absorbing_organisation.owned_schemes.first) - expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(new_absorbing_organisation.owned_schemes.first.locations.first) - expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(new_absorbing_organisation.owned_schemes.first) + new_lettings_log = new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id) + new_lettings_log_scheme = new_absorbing_organisation.owned_schemes.find_by(service_name: new_lettings_log.scheme.service_name) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(new_lettings_log_scheme) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(new_lettings_log_scheme.locations.first) + expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(new_lettings_log_scheme) expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to eq(nil) end