Update tests that relied on user factory default name

spec/models/user_spec.rb

@@ -380,7 +380,7 @@ RSpec.describe User, type: :model do
   end
 
   describe "paper trail" do
-    let(:user) { create(:user) }
+    let(:user) { create(:user, name: "Danny Rojas") }
 
     it "creates a record of changes to a log" do
       expect { user.update!(name: "new test name") }.to change(user.versions, :count).by(1)

spec/requests/users_controller_spec.rb

@@ -1261,8 +1261,8 @@ RSpec.describe UsersController, type: :request do
   end
 
   context "when user is signed in as a support user" do
-    let(:user) { create(:user, :support, organisation: create(:organisation, :without_dpc)) }
+    let(:user) { create(:user, :support, name: "Danny Rojas", organisation: create(:organisation, :without_dpc)) }
-    let(:other_user) { create(:user, organisation: user.organisation, last_sign_in_at: Time.zone.now) }
+    let(:other_user) { create(:user, name: "Danny Rojas", organisation: user.organisation, last_sign_in_at: Time.zone.now) }
 
     before do
       allow(user).to receive(:need_two_factor_authentication?).and_return(false)

spec/services/exports/user_export_service_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Exports::UserExportService do
     end
 
     context "and one user is available for export" do
-      let!(:user) { create(:user, organisation:, phone_extension: "123") }
+      let!(:user) { create(:user, organisation:, name: "Danny Rojas", phone_extension: "123") }
 
       it "generates a ZIP export file with the expected filename" do
         expect(storage_service).to receive(:write_file).with(expected_zip_filename, any_args)

spec/services/merge/merge_organisations_service_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Merge::MergeOrganisationsService do
 
       it "moves the users from merging organisation to absorbing organisation" do
         expect(Rails.logger).to receive(:info).with("Merged users from fake org:")
-        expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})")
+        expect(Rails.logger).to receive(:info).with("\t#{merging_organisation.data_protection_officers.first.name} (#{merging_organisation.data_protection_officers.first.email})")
         expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)")
         expect(Rails.logger).to receive(:info).with("New schemes from fake org:")
         merge_organisations_service.call
@@ -477,7 +477,7 @@ RSpec.describe Merge::MergeOrganisationsService do
 
           it "logs the merged schemes and locations" do
             expect(Rails.logger).to receive(:info).with("Merged users from fake org:")
-            expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})")
+            expect(Rails.logger).to receive(:info).with("\t#{merging_organisation.data_protection_officers.first.name} (#{merging_organisation.data_protection_officers.first.email})")
             expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)")
             expect(Rails.logger).to receive(:info).with("New schemes from fake org:")
             expect(Rails.logger).to receive(:info).with(/\t#{scheme.service_name} \(S/)
@@ -744,7 +744,7 @@ RSpec.describe Merge::MergeOrganisationsService do
 
             it "logs the merged schemes" do
               expect(Rails.logger).to receive(:info).with("Merged users from fake org:")
-              expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})")
+              expect(Rails.logger).to receive(:info).with("\t#{merging_organisation.data_protection_officers.first.name} (#{merging_organisation.data_protection_officers.first.email})")
               expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)")
               expect(Rails.logger).to receive(:info).with("New schemes from fake org:")
               expect(Rails.logger).to receive(:info).with(/\t#{scheme.service_name} \(S/)
@@ -922,7 +922,7 @@ RSpec.describe Merge::MergeOrganisationsService do
       let!(:merging_organisation_user) { create(:user, organisation: merging_organisation, name: "fake name", email: "fake@email.com") }
 
       before do
-        create_list(:user, 5, organisation: merging_organisation_too)
+        create_list(:user, 5, organisation: merging_organisation_too, name: "Danny Rojas")
       end
 
       it "sets merge date and absorbing organisation on merged organisations" do
@@ -961,7 +961,7 @@ RSpec.describe Merge::MergeOrganisationsService do
       context "and merging users" do
         it "moves the users from merging organisations to absorbing organisation" do
           expect(Rails.logger).to receive(:info).with("Merged users from fake org:")
-          expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})")
+          expect(Rails.logger).to receive(:info).with("\t#{merging_organisation.data_protection_officers.first.name} (#{merging_organisation.data_protection_officers.first.email})")
           expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)")
           expect(Rails.logger).to receive(:info).with("Merged users from second org:")
           expect(Rails.logger).to receive(:info).with(/\tDanny Rojas/).exactly(6).times
@@ -1113,7 +1113,7 @@ RSpec.describe Merge::MergeOrganisationsService do
 
       it "moves the users from merging organisation to absorbing organisation" do
         expect(Rails.logger).to receive(:info).with("Merged users from fake org:")
-        expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})")
+        expect(Rails.logger).to receive(:info).with("\t#{merging_organisation.data_protection_officers.first.name} (#{merging_organisation.data_protection_officers.first.email})")
         expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)")
         expect(Rails.logger).to receive(:info).with("New schemes from fake org:")
         merge_organisations_service.call
@@ -1251,7 +1251,7 @@ RSpec.describe Merge::MergeOrganisationsService do
 
         it "logs the merged schemes" do
           expect(Rails.logger).to receive(:info).with("Merged users from fake org:")
-          expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})")
+          expect(Rails.logger).to receive(:info).with("\t#{merging_organisation.data_protection_officers.first.name} (#{merging_organisation.data_protection_officers.first.email})")
           expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)")
           expect(Rails.logger).to receive(:info).with("New schemes from fake org:")
           expect(Rails.logger).to receive(:info).with(/\t#{scheme.service_name} \(S/)
@@ -1462,7 +1462,7 @@ RSpec.describe Merge::MergeOrganisationsService do
 
           it "logs the merged schemes" do
             expect(Rails.logger).to receive(:info).with("Merged users from fake org:")
-            expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})")
+            expect(Rails.logger).to receive(:info).with("\t#{merging_organisation.data_protection_officers.first.name} (#{merging_organisation.data_protection_officers.first.email})")
             expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)")
             expect(Rails.logger).to receive(:info).with("New schemes from fake org:")
             expect(Rails.logger).to receive(:info).with(/\t#{scheme.service_name} \(S/)
@@ -1590,12 +1590,12 @@ RSpec.describe Merge::MergeOrganisationsService do
       let!(:merging_organisation_user) { create(:user, organisation: merging_organisation, name: "fake name", email: "fake@email.com") }
 
       before do
-        create_list(:user, 5, organisation: merging_organisation_too)
+        create_list(:user, 5, organisation: merging_organisation_too, name: "Danny Rojas")
       end
 
       it "moves the users from merging organisations to absorbing organisation" do
         expect(Rails.logger).to receive(:info).with("Merged users from fake org:")
-        expect(Rails.logger).to receive(:info).with("\tDanny Rojas (#{merging_organisation.data_protection_officers.first.email})")
+        expect(Rails.logger).to receive(:info).with("\t#{merging_organisation.data_protection_officers.first.name} (#{merging_organisation.data_protection_officers.first.email})")
         expect(Rails.logger).to receive(:info).with("\tfake name (fake@email.com)")
         expect(Rails.logger).to receive(:info).with("Merged users from second org:")
         expect(Rails.logger).to receive(:info).with(/\tDanny Rojas/).exactly(6).times