Update RSpec helper methods to *_next_instance_of

Auto-correct some references in RSpec as:
- expect_any_instance_of -> expect_next_instance_of
- allow_any_instance_of -> allow_next_instance_of

Related to https://gitlab.com/gitlab-org/gitlab/issues/34997

spec/services/merge_requests/conflicts/list_service_spec.rb

@@ -74,7 +74,9 @@ describe MergeRequests::Conflicts::ListService do
     it 'returns a falsey value when the MR has a missing ref after a force push' do
       merge_request = create_merge_request('conflict-resolvable')
       service = conflicts_service(merge_request)
-      allow_any_instance_of(Gitlab::GitalyClient::ConflictsService).to receive(:list_conflict_files).and_raise(GRPC::Unknown)
+      allow_next_instance_of(Gitlab::GitalyClient::ConflictsService) do |instance|
+        allow(instance).to receive(:list_conflict_files).and_raise(GRPC::Unknown)
+      end
 
       expect(service.can_be_resolved_in_ui?).to be_falsey
     end

spec/services/merge_requests/create_from_issue_service_spec.rb

@@ -55,7 +55,9 @@ describe MergeRequests::CreateFromIssueService do
       end
 
       it 'creates the new_issue_branch system note when the branch could be created but the merge_request cannot be created', :sidekiq_might_not_need_inline do
-        expect_any_instance_of(MergeRequest).to receive(:valid?).at_least(:once).and_return(false)
+        expect_next_instance_of(MergeRequest) do |instance|
+          expect(instance).to receive(:valid?).at_least(:once).and_return(false)
+        end
 
         expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, issue.to_branch_name, branch_project: target_project)
 

spec/services/merge_requests/push_options_handler_service_spec.rb

@@ -714,9 +714,9 @@ describe MergeRequests::PushOptionsHandlerService do
     let(:exception) { StandardError.new('My standard error') }
 
     def run_service_with_exception
-      allow_any_instance_of(
-        MergeRequests::BuildService
-      ).to receive(:execute).and_raise(exception)
+      allow_next_instance_of(MergeRequests::BuildService) do |instance|
+        allow(instance).to receive(:execute).and_raise(exception)
+      end
 
       service.execute
     end
@@ -766,9 +766,9 @@ describe MergeRequests::PushOptionsHandlerService do
       invalid_merge_request = MergeRequest.new
       invalid_merge_request.errors.add(:base, 'my error')
 
-      expect_any_instance_of(
-        MergeRequests::CreateService
-      ).to receive(:execute).and_return(invalid_merge_request)
+      expect_next_instance_of(MergeRequests::CreateService) do |instance|
+        expect(instance).to receive(:execute).and_return(invalid_merge_request)
+      end
 
       service.execute
 

spec/services/milestones/promote_service_spec.rb

@@ -31,7 +31,9 @@ describe Milestones::PromoteService do
       it 'does not promote milestone and update issuables if promoted milestone is not valid' do
         issue = create(:issue, milestone: milestone, project: project)
         merge_request = create(:merge_request, milestone: milestone, source_project: project)
-        allow_any_instance_of(Milestone).to receive(:valid?).and_return(false)
+        allow_next_instance_of(Milestone) do |instance|
+          allow(instance).to receive(:valid?).and_return(false)
+        end
 
         expect { service.execute(milestone) }.to raise_error(described_class::PromoteMilestoneError)
 

spec/services/milestones/transfer_service_spec.rb

@@ -71,7 +71,9 @@ describe Milestones::TransferService do
 
         context 'when find_or_create_milestone returns nil' do
           before do
-            allow_any_instance_of(Milestones::FindOrCreateService).to receive(:execute).and_return(nil)
+            allow_next_instance_of(Milestones::FindOrCreateService) do |instance|
+              allow(instance).to receive(:execute).and_return(nil)
+            end
           end
 
           it 'removes issues group milestone' do

spec/services/namespaces/statistics_refresher_service_spec.rb

@@ -17,7 +17,9 @@ describe Namespaces::StatisticsRefresherService, '#execute' do
     end
 
     it 'recalculate the namespace statistics' do
-      expect_any_instance_of(Namespace::RootStorageStatistics).to receive(:recalculate!).once
+      expect_next_instance_of(Namespace::RootStorageStatistics) do |instance|
+        expect(instance).to receive(:recalculate!).once
+      end
 
       service.execute(group)
     end
@@ -45,8 +47,9 @@ describe Namespaces::StatisticsRefresherService, '#execute' do
 
   context 'when something goes wrong' do
     before do
-      allow_any_instance_of(Namespace::RootStorageStatistics)
-        .to receive(:recalculate!).and_raise(ActiveRecord::ActiveRecordError)
+      allow_next_instance_of(Namespace::RootStorageStatistics) do |instance|
+        allow(instance).to receive(:recalculate!).and_raise(ActiveRecord::ActiveRecordError)
+      end
     end
 
     it 'raises RefreshError' do

spec/services/notes/resolve_service_spec.rb

@@ -17,7 +17,9 @@ describe Notes::ResolveService do
     end
 
     it "sends notifications if all discussions are resolved" do
-      expect_any_instance_of(MergeRequests::ResolvedDiscussionNotificationService).to receive(:execute).with(merge_request)
+      expect_next_instance_of(MergeRequests::ResolvedDiscussionNotificationService) do |instance|
+        expect(instance).to receive(:execute).with(merge_request)
+      end
 
       described_class.new(merge_request.project, user).execute(note)
     end

spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb

@@ -32,9 +32,9 @@ describe PagesDomains::ObtainLetsEncryptCertificateService do
   def stub_lets_encrypt_order(url, status)
     order = ::Gitlab::LetsEncrypt::Order.new(acme_order_double(status: status))
 
-    allow_any_instance_of(::Gitlab::LetsEncrypt::Client).to(
-      receive(:load_order).with(url).and_return(order)
-    )
+    allow_next_instance_of(::Gitlab::LetsEncrypt::Client) do |instance|
+      allow(instance).to receive(:load_order).with(url).and_return(order)
+    end
 
     order
   end

spec/services/projects/create_service_spec.rb

@@ -247,7 +247,9 @@ describe Projects::CreateService, '#execute' do
 
   context 'repository creation' do
     it 'synchronously creates the repository' do
-      expect_any_instance_of(Project).to receive(:create_repository)
+      expect_next_instance_of(Project) do |instance|
+        expect(instance).to receive(:create_repository)
+      end
 
       project = create_project(user, opts)
       expect(project).to be_valid

spec/services/projects/import_export/export_service_spec.rb

@@ -94,7 +94,9 @@ describe Projects::ImportExport::ExportService do
         end
 
         it 'notifies the user' do
-          expect_any_instance_of(NotificationService).to receive(:project_not_exported)
+          expect_next_instance_of(NotificationService) do |instance|
+            expect(instance).to receive(:project_not_exported)
+          end
         end
 
         it 'notifies logger' do
@@ -122,7 +124,9 @@ describe Projects::ImportExport::ExportService do
       end
 
       it 'notifies the user' do
-        expect_any_instance_of(NotificationService).to receive(:project_not_exported)
+        expect_next_instance_of(NotificationService) do |instance|
+          expect(instance).to receive(:project_not_exported)
+        end
       end
 
       it 'notifies logger' do

spec/services/projects/lfs_pointers/lfs_import_service_spec.rb

@@ -16,7 +16,9 @@ describe Projects::LfsPointers::LfsImportService do
 
     it 'downloads lfs objects' do
       service = double
-      expect_any_instance_of(Projects::LfsPointers::LfsObjectDownloadListService).to receive(:execute).and_return(oid_download_links)
+      expect_next_instance_of(Projects::LfsPointers::LfsObjectDownloadListService) do |instance|
+        expect(instance).to receive(:execute).and_return(oid_download_links)
+      end
       expect(Projects::LfsPointers::LfsDownloadService).to receive(:new).and_return(service).twice
       expect(service).to receive(:execute).twice
 
@@ -27,7 +29,9 @@ describe Projects::LfsPointers::LfsImportService do
 
     context 'when no downloadable lfs object links' do
       it 'does not call LfsDownloadService' do
-        expect_any_instance_of(Projects::LfsPointers::LfsObjectDownloadListService).to receive(:execute).and_return({})
+        expect_next_instance_of(Projects::LfsPointers::LfsObjectDownloadListService) do |instance|
+          expect(instance).to receive(:execute).and_return({})
+        end
         expect(Projects::LfsPointers::LfsDownloadService).not_to receive(:new)
 
         result = subject.execute
@@ -39,7 +43,9 @@ describe Projects::LfsPointers::LfsImportService do
     context 'when an exception is raised' do
       it 'returns error' do
         error_message = "error message"
-        expect_any_instance_of(Projects::LfsPointers::LfsObjectDownloadListService).to receive(:execute).and_raise(StandardError, error_message)
+        expect_next_instance_of(Projects::LfsPointers::LfsObjectDownloadListService) do |instance|
+          expect(instance).to receive(:execute).and_raise(StandardError, error_message)
+        end
 
         result = subject.execute
 

spec/services/projects/update_pages_service_spec.rb

@@ -110,8 +110,9 @@ describe Projects::UpdatePagesService do
 
       context 'when timeout happens by DNS error' do
         before do
-          allow_any_instance_of(described_class)
-            .to receive(:extract_zip_archive!).and_raise(SocketError)
+          allow_next_instance_of(described_class) do |instance|
+            allow(instance).to receive(:extract_zip_archive!).and_raise(SocketError)
+          end
         end
 
         it 'raises an error' do
@@ -125,9 +126,10 @@ describe Projects::UpdatePagesService do
 
       context 'when failed to extract zip artifacts' do
         before do
-          expect_any_instance_of(described_class)
-            .to receive(:extract_zip_archive!)
-            .and_raise(Projects::UpdatePagesService::FailedToExtractError)
+          expect_next_instance_of(described_class) do |instance|
+            expect(instance).to receive(:extract_zip_archive!)
+              .and_raise(Projects::UpdatePagesService::FailedToExtractError)
+          end
         end
 
         it 'raises an error' do

spec/services/system_notes/issuables_service_spec.rb

@@ -265,7 +265,9 @@ describe ::SystemNotes::IssuablesService do
 
     context 'when cross-reference disallowed' do
       before do
-        expect_any_instance_of(described_class).to receive(:cross_reference_disallowed?).and_return(true)
+        expect_next_instance_of(described_class) do |instance|
+          expect(instance).to receive(:cross_reference_disallowed?).and_return(true)
+        end
       end
 
       it 'returns nil' do
@@ -279,7 +281,9 @@ describe ::SystemNotes::IssuablesService do
 
     context 'when cross-reference allowed' do
       before do
-        expect_any_instance_of(described_class).to receive(:cross_reference_disallowed?).and_return(false)
+        expect_next_instance_of(described_class) do |instance|
+          expect(instance).to receive(:cross_reference_disallowed?).and_return(false)
+        end
       end
 
       it_behaves_like 'a system note' do

spec/support/import_export/common_util.rb

@@ -3,7 +3,9 @@
 module ImportExport
   module CommonUtil
     def setup_symlink(tmpdir, symlink_name)
-      allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(tmpdir)
+      allow_next_instance_of(Gitlab::ImportExport) do |instance|
+        allow(instance).to receive(:storage_path).and_return(tmpdir)
+      end
 
       File.open("#{tmpdir}/test", 'w') { |file| file.write("test") }
       FileUtils.ln_s("#{tmpdir}/test", "#{tmpdir}/#{symlink_name}")

spec/workers/ci/archive_traces_cron_worker_spec.rb

@@ -35,8 +35,9 @@ describe Ci::ArchiveTracesCronWorker do
     it_behaves_like 'archives trace'
 
     it 'executes service' do
-      expect_any_instance_of(Ci::ArchiveTraceService)
-        .to receive(:execute).with(build, anything)
+      expect_next_instance_of(Ci::ArchiveTraceService) do |instance|
+        expect(instance).to receive(:execute).with(build, anything)
+      end
 
       subject
     end
@@ -64,7 +65,9 @@ describe Ci::ArchiveTracesCronWorker do
 
       before do
         allow(Gitlab::ErrorTracking).to receive(:track_and_raise_for_dev_exception)
-        allow_any_instance_of(Gitlab::Ci::Trace).to receive(:archive!).and_raise('Unexpected error')
+        allow_next_instance_of(Gitlab::Ci::Trace) do |instance|
+          allow(instance).to receive(:archive!).and_raise('Unexpected error')
+        end
       end
 
       it 'puts a log' do

spec/workers/concerns/gitlab/github_import/rescheduling_methods_spec.rb

@@ -57,9 +57,9 @@ describe Gitlab::GithubImport::ReschedulingMethods do
         expect(worker)
           .not_to receive(:notify_waiter)
 
-        expect_any_instance_of(Gitlab::GithubImport::Client)
-          .to receive(:rate_limit_resets_in)
-          .and_return(14)
+        expect_next_instance_of(Gitlab::GithubImport::Client) do |instance|
+          expect(instance).to receive(:rate_limit_resets_in).and_return(14)
+        end
 
         expect(worker.class)
           .to receive(:perform_in)

spec/workers/delete_merged_branches_worker_spec.rb

@@ -9,7 +9,9 @@ describe DeleteMergedBranchesWorker do
 
   describe "#perform" do
     it "delegates to Branches::DeleteMergedService" do
-      expect_any_instance_of(::Branches::DeleteMergedService).to receive(:execute).and_return(true)
+      expect_next_instance_of(::Branches::DeleteMergedService) do |instance|
+        expect(instance).to receive(:execute).and_return(true)
+      end
 
       worker.perform(project.id, project.owner.id)
     end

spec/workers/expire_build_artifacts_worker_spec.rb

@@ -7,7 +7,9 @@ describe ExpireBuildArtifactsWorker do
 
   describe '#perform' do
     it 'executes a service' do
-      expect_any_instance_of(Ci::DestroyExpiredJobArtifactsService).to receive(:execute)
+      expect_next_instance_of(Ci::DestroyExpiredJobArtifactsService) do |instance|
+        expect(instance).to receive(:execute)
+      end
 
       worker.perform
     end

spec/workers/gitlab/github_import/stage/import_repository_worker_spec.rb

@@ -21,9 +21,9 @@ describe Gitlab::GithubImport::Stage::ImportRepositoryWorker do
       it 'schedules the importing of the base data' do
         client = double(:client)
 
-        expect_any_instance_of(Gitlab::GithubImport::Importer::RepositoryImporter)
-          .to receive(:execute)
-          .and_return(true)
+        expect_next_instance_of(Gitlab::GithubImport::Importer::RepositoryImporter) do |instance|
+          expect(instance).to receive(:execute).and_return(true)
+        end
 
         expect(Gitlab::GithubImport::Stage::ImportBaseDataWorker)
           .to receive(:perform_async)
@@ -37,9 +37,9 @@ describe Gitlab::GithubImport::Stage::ImportRepositoryWorker do
       it 'does not schedule the importing of the base data' do
         client = double(:client)
 
-        expect_any_instance_of(Gitlab::GithubImport::Importer::RepositoryImporter)
-          .to receive(:execute)
-          .and_return(false)
+        expect_next_instance_of(Gitlab::GithubImport::Importer::RepositoryImporter) do |instance|
+          expect(instance).to receive(:execute).and_return(false)
+        end
 
         expect(Gitlab::GithubImport::Stage::ImportBaseDataWorker)
           .not_to receive(:perform_async)

spec/workers/gitlab_shell_worker_spec.rb

@@ -7,7 +7,9 @@ describe GitlabShellWorker do
 
   describe '#perform with add_key' do
     it 'calls add_key on Gitlab::Shell' do
-      expect_any_instance_of(Gitlab::Shell).to receive(:add_key).with('foo', 'bar')
+      expect_next_instance_of(Gitlab::Shell) do |instance|
+        expect(instance).to receive(:add_key).with('foo', 'bar')
+      end
       worker.perform(:add_key, 'foo', 'bar')
     end
   end

spec/workers/gitlab_usage_ping_worker_spec.rb

@@ -8,7 +8,9 @@ describe GitlabUsagePingWorker do
   it 'delegates to SubmitUsagePingService' do
     allow(subject).to receive(:try_obtain_lease).and_return(true)
 
-    expect_any_instance_of(SubmitUsagePingService).to receive(:execute)
+    expect_next_instance_of(SubmitUsagePingService) do |instance|
+      expect(instance).to receive(:execute)
+    end
 
     subject.perform
   end

spec/workers/hashed_storage/migrator_worker_spec.rb

@@ -10,7 +10,9 @@ describe HashedStorage::MigratorWorker do
 
   describe '#perform' do
     it 'delegates to MigratorService' do
-      expect_any_instance_of(Gitlab::HashedStorage::Migrator).to receive(:bulk_migrate).with(start: 5, finish: 10)
+      expect_next_instance_of(Gitlab::HashedStorage::Migrator) do |instance|
+        expect(instance).to receive(:bulk_migrate).with(start: 5, finish: 10)
+      end
 
       worker.perform(5, 10)
     end

spec/workers/hashed_storage/rollbacker_worker_spec.rb

@@ -10,7 +10,9 @@ describe HashedStorage::RollbackerWorker do
 
   describe '#perform' do
     it 'delegates to MigratorService' do
-      expect_any_instance_of(Gitlab::HashedStorage::Migrator).to receive(:bulk_rollback).with(start: 5, finish: 10)
+      expect_next_instance_of(Gitlab::HashedStorage::Migrator) do |instance|
+        expect(instance).to receive(:bulk_rollback).with(start: 5, finish: 10)
+      end
 
       worker.perform(5, 10)
     end

spec/workers/import_issues_csv_worker_spec.rb

@@ -11,7 +11,9 @@ describe ImportIssuesCsvWorker do
 
   describe '#perform' do
     it 'calls #execute on Issues::ImportCsvService and destroys upload' do
-      expect_any_instance_of(Issues::ImportCsvService).to receive(:execute).and_return({ success: 5, errors: [], valid_file: true })
+      expect_next_instance_of(Issues::ImportCsvService) do |instance|
+        expect(instance).to receive(:execute).and_return({ success: 5, errors: [], valid_file: true })
+      end
 
       worker.perform(user.id, project.id, upload.id)
 

spec/workers/new_release_worker_spec.rb

@@ -6,7 +6,9 @@ describe NewReleaseWorker do
   let(:release) { create(:release) }
 
   it 'sends a new release notification' do
-    expect_any_instance_of(NotificationService).to receive(:send_new_release_notifications).with(release)
+    expect_next_instance_of(NotificationService) do |instance|
+      expect(instance).to receive(:send_new_release_notifications).with(release)
+    end
 
     described_class.new.perform(release.id)
   end

spec/workers/repository_import_worker_spec.rb

@@ -21,8 +21,9 @@ describe RepositoryImportWorker do
 
         allow(subject).to receive(:jid).and_return(jid)
 
-        expect_any_instance_of(Projects::ImportService).to receive(:execute)
-          .and_return({ status: :ok })
+        expect_next_instance_of(Projects::ImportService) do |instance|
+          expect(instance).to receive(:execute).and_return({ status: :ok })
+        end
 
         # Works around https://github.com/rspec/rspec-mocks/issues/910
         expect(Project).to receive(:find).with(started_project.id).and_return(started_project)
@@ -36,8 +37,9 @@ describe RepositoryImportWorker do
 
     context 'when the import was successful' do
       it 'imports a project' do
-        expect_any_instance_of(Projects::ImportService).to receive(:execute)
-          .and_return({ status: :ok })
+        expect_next_instance_of(Projects::ImportService) do |instance|
+          expect(instance).to receive(:execute).and_return({ status: :ok })
+        end
 
         # Works around https://github.com/rspec/rspec-mocks/issues/910
         expect(Project).to receive(:find).with(project.id).and_return(project)
@@ -54,7 +56,9 @@ describe RepositoryImportWorker do
         error = %q{remote: Not Found fatal: repository 'https://user:pass@test.com/root/repoC.git/' not found }
 
         import_state.update(jid: '123')
-        expect_any_instance_of(Projects::ImportService).to receive(:execute).and_return({ status: :error, message: error })
+        expect_next_instance_of(Projects::ImportService) do |instance|
+          expect(instance).to receive(:execute).and_return({ status: :error, message: error })
+        end
 
         expect do
           subject.perform(project.id)
@@ -67,7 +71,9 @@ describe RepositoryImportWorker do
 
         project.update(import_type: 'gitlab_project')
         import_state.update(jid: '123')
-        expect_any_instance_of(Projects::ImportService).to receive(:execute).and_return({ status: :error, message: error })
+        expect_next_instance_of(Projects::ImportService) do |instance|
+          expect(instance).to receive(:execute).and_return({ status: :error, message: error })
+        end
 
         expect do
           subject.perform(project.id)
@@ -93,8 +99,9 @@ describe RepositoryImportWorker do
           .to receive(:async?)
           .and_return(true)
 
-        expect_any_instance_of(ProjectImportState)
-          .not_to receive(:finish)
+        expect_next_instance_of(ProjectImportState) do |instance|
+          expect(instance).not_to receive(:finish)
+        end
 
         subject.perform(project.id)
       end