Merge branch 'main' into CLDC-4154-needs-type-hint-text

spec/features/user_spec.rb

@@ -815,7 +815,7 @@ RSpec.describe "User Features" do
           find("#owning-organisation-field").click.native.send_keys("F", "i", "l", "t")
           select(parent_organisation.name, from: "owning-organisation-field-select", visible: false)
           click_button("Apply filters")
-          expect(page).to have_current_path("/lettings-logs?%5Byears%5D%5B%5D=&%5Bstatus%5D%5B%5D=&%5Bneedstypes%5D%5B%5D=&assigned_to=all&user_text_search=&owning_organisation_select=specific_org&owning_organisation_text_search=&owning_organisation=#{parent_organisation.id}&managing_organisation_select=all&managing_organisation_text_search=")
+          expect(page).to have_current_path(/lettings-logs\?%5Byears%5D%5B%5D=&%5Bstatus%5D%5B%5D=&%5Bneedstypes%5D%5B%5D=&assigned_to=all&user_text_search=&owning_organisation_select=specific_org&owning_organisation_text_search=&owning_organisation=\d+&managing_organisation_select=all&managing_organisation_text_search=/)
           choose("owning-organisation-select-all-field", allow_label_click: true)
           click_button("Apply filters")
           expect(page).to have_current_path("/lettings-logs?%5Byears%5D%5B%5D=&%5Bstatus%5D%5B%5D=&%5Bneedstypes%5D%5B%5D=&assigned_to=all&user_text_search=&owning_organisation_select=all&owning_organisation_text_search=&managing_organisation_select=all&managing_organisation_text_search=")

spec/lib/tasks/count_duplicates_spec.rb

@@ -44,7 +44,12 @@ RSpec.describe "count_duplicates" do
         end
 
         it "creates a csv with correct duplicate numbers" do
-          expect(storage_service).to receive(:write_file).with(/scheme-duplicates-.*\.csv/, "\uFEFFOrganisation id,Number of duplicate sets,Total duplicate schemes\n#{organisation.id},2,5\n#{organisation2.id},1,5\n")
+          expect(storage_service).to receive(:write_file).with(/scheme-duplicates-.*\.csv/, satisfy do |s|
+            s.start_with?("\uFEFFOrganisation id,Number of duplicate sets,Total duplicate schemes") &&
+              s.include?("#{organisation.id},2,5") &&
+              s.include?("#{organisation2.id},1,5") &&
+              s.count("\n") == 3
+          end)
           expect(Rails.logger).to receive(:info).with("Download URL: #{test_url}")
           task.invoke
         end

spec/services/merge/merge_organisations_service_spec.rb

@@ -1582,9 +1582,12 @@ 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_absorbing_organisation_lettings_log = new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id)
+            new_absorbing_organisation_scheme = new_absorbing_organisation.owned_schemes.find_by(service_name: new_absorbing_organisation_lettings_log.scheme.service_name)
+            new_absorbing_organisation_location = new_absorbing_organisation_scheme.locations.find_by(name: new_absorbing_organisation_lettings_log.location.name)
+            expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).scheme).to eq(new_absorbing_organisation_scheme)
+            expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log.id).location).to eq(new_absorbing_organisation_location)
+            expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).scheme).to eq(new_absorbing_organisation_scheme)
             expect(new_absorbing_organisation.owned_lettings_logs.find(owned_lettings_log_no_location.id).location).to eq(nil)
           end