Merge branch 'rspec-next-instance-of' into 'master'

Update RSpec helper methods to *_next_instance_of

See merge request gitlab-org/gitlab!21244

spec/lib/gitlab/auth/ldap/access_spec.rb

@@ -136,7 +136,9 @@ describe Gitlab::Auth::LDAP::Access do
       context 'without ActiveDirectory enabled' do
         before do
           allow(Gitlab::Auth::LDAP::Config).to receive(:enabled?).and_return(true)
-          allow_any_instance_of(Gitlab::Auth::LDAP::Config).to receive(:active_directory).and_return(false)
+          allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance|
+            allow(instance).to receive(:active_directory).and_return(false)
+          end
         end
 
         it 'returns true' do

spec/lib/gitlab/auth/ldap/auth_hash_spec.rb

@@ -58,7 +58,9 @@ describe Gitlab::Auth::LDAP::AuthHash do
     end
 
     before do
-      allow_any_instance_of(Gitlab::Auth::LDAP::Config).to receive(:attributes).and_return(attributes)
+      allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance|
+        allow(instance).to receive(:attributes).and_return(attributes)
+      end
     end
 
     it "has the correct username" do

spec/lib/gitlab/auth/ldap/authentication_spec.rb

@@ -18,8 +18,9 @@ describe Gitlab::Auth::LDAP::Authentication do
 
       # try only to fake the LDAP call
       adapter = double('adapter', dn: dn).as_null_object
-      allow_any_instance_of(described_class)
-        .to receive(:adapter).and_return(adapter)
+      allow_next_instance_of(described_class) do |instance|
+        allow(instance).to receive(:adapter).and_return(adapter)
+      end
 
       expect(described_class.login(login, password)).to be_truthy
     end
@@ -27,8 +28,9 @@ describe Gitlab::Auth::LDAP::Authentication do
     it "is false if the user does not exist" do
       # try only to fake the LDAP call
       adapter = double('adapter', dn: dn).as_null_object
-      allow_any_instance_of(described_class)
-        .to receive(:adapter).and_return(adapter)
+      allow_next_instance_of(described_class) do |instance|
+        allow(instance).to receive(:adapter).and_return(adapter)
+      end
 
       expect(described_class.login(login, password)).to be_falsey
     end
@@ -38,8 +40,9 @@ describe Gitlab::Auth::LDAP::Authentication do
 
       # try only to fake the LDAP call
       adapter = double('adapter', bind_as: nil).as_null_object
-      allow_any_instance_of(described_class)
-        .to receive(:adapter).and_return(adapter)
+      allow_next_instance_of(described_class) do |instance|
+        allow(instance).to receive(:adapter).and_return(adapter)
+      end
 
       expect(described_class.login(login, password)).to be_falsey
     end

spec/lib/gitlab/auth/o_auth/user_spec.rb

@@ -396,7 +396,9 @@ describe Gitlab::Auth::OAuth::User do
         context "and no account for the LDAP user" do
           context 'dont block on create (LDAP)' do
             before do
-              allow_any_instance_of(Gitlab::Auth::LDAP::Config).to receive_messages(block_auto_created_users: false)
+              allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance|
+                allow(instance).to receive_messages(block_auto_created_users: false)
+              end
             end
 
             it do
@@ -408,7 +410,9 @@ describe Gitlab::Auth::OAuth::User do
 
           context 'block on create (LDAP)' do
             before do
-              allow_any_instance_of(Gitlab::Auth::LDAP::Config).to receive_messages(block_auto_created_users: true)
+              allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance|
+                allow(instance).to receive_messages(block_auto_created_users: true)
+              end
             end
 
             it do
@@ -424,7 +428,9 @@ describe Gitlab::Auth::OAuth::User do
 
           context 'dont block on create (LDAP)' do
             before do
-              allow_any_instance_of(Gitlab::Auth::LDAP::Config).to receive_messages(block_auto_created_users: false)
+              allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance|
+                allow(instance).to receive_messages(block_auto_created_users: false)
+              end
             end
 
             it do
@@ -436,7 +442,9 @@ describe Gitlab::Auth::OAuth::User do
 
           context 'block on create (LDAP)' do
             before do
-              allow_any_instance_of(Gitlab::Auth::LDAP::Config).to receive_messages(block_auto_created_users: true)
+              allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance|
+                allow(instance).to receive_messages(block_auto_created_users: true)
+              end
             end
 
             it do
@@ -480,7 +488,9 @@ describe Gitlab::Auth::OAuth::User do
 
         context 'dont block on create (LDAP)' do
           before do
-            allow_any_instance_of(Gitlab::Auth::LDAP::Config).to receive_messages(block_auto_created_users: false)
+            allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance|
+              allow(instance).to receive_messages(block_auto_created_users: false)
+            end
           end
 
           it do
@@ -492,7 +502,9 @@ describe Gitlab::Auth::OAuth::User do
 
         context 'block on create (LDAP)' do
           before do
-            allow_any_instance_of(Gitlab::Auth::LDAP::Config).to receive_messages(block_auto_created_users: true)
+            allow_next_instance_of(Gitlab::Auth::LDAP::Config) do |instance|
+              allow(instance).to receive_messages(block_auto_created_users: true)
+            end
           end
 
           it do

spec/lib/gitlab/bare_repository_import/importer_spec.rb

@@ -75,7 +75,9 @@ describe Gitlab::BareRepositoryImport::Importer, :seed_helper do
       end
 
       it 'does not schedule an import' do
-        expect_any_instance_of(Project).not_to receive(:import_schedule)
+        expect_next_instance_of(Project) do |instance|
+          expect(instance).not_to receive(:import_schedule)
+        end
 
         importer.create_project_if_needed
       end

spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb

@@ -9,7 +9,9 @@ describe Gitlab::Cache::Ci::ProjectPipelineStatus, :clean_gitlab_redis_cache do
 
   describe '.load_for_project' do
     it "loads the status" do
-      expect_any_instance_of(described_class).to receive(:load_status)
+      expect_next_instance_of(described_class) do |instance|
+        expect(instance).to receive(:load_status)
+      end
 
       described_class.load_for_project(project)
     end

spec/lib/gitlab/checks/branch_check_spec.rb

@@ -32,7 +32,9 @@ describe Gitlab::Checks::BranchCheck do
       end
 
       it 'raises an error if the user is not allowed to merge to protected branches' do
-        expect_any_instance_of(Gitlab::Checks::MatchingMergeRequest).to receive(:match?).and_return(true)
+        expect_next_instance_of(Gitlab::Checks::MatchingMergeRequest) do |instance|
+          expect(instance).to receive(:match?).and_return(true)
+        end
         expect(user_access).to receive(:can_merge_to_branch?).and_return(false)
         expect(user_access).to receive(:can_push_to_branch?).and_return(false)
 

spec/lib/gitlab/checks/change_access_spec.rb

@@ -14,31 +14,41 @@ describe Gitlab::Checks::ChangeAccess do
       end
 
       it 'calls pushes checks' do
-        expect_any_instance_of(Gitlab::Checks::PushCheck).to receive(:validate!)
+        expect_next_instance_of(Gitlab::Checks::PushCheck) do |instance|
+          expect(instance).to receive(:validate!)
+        end
 
         subject.exec
       end
 
       it 'calls branches checks' do
-        expect_any_instance_of(Gitlab::Checks::BranchCheck).to receive(:validate!)
+        expect_next_instance_of(Gitlab::Checks::BranchCheck) do |instance|
+          expect(instance).to receive(:validate!)
+        end
 
         subject.exec
       end
 
       it 'calls tags checks' do
-        expect_any_instance_of(Gitlab::Checks::TagCheck).to receive(:validate!)
+        expect_next_instance_of(Gitlab::Checks::TagCheck) do |instance|
+          expect(instance).to receive(:validate!)
+        end
 
         subject.exec
       end
 
       it 'calls lfs checks' do
-        expect_any_instance_of(Gitlab::Checks::LfsCheck).to receive(:validate!)
+        expect_next_instance_of(Gitlab::Checks::LfsCheck) do |instance|
+          expect(instance).to receive(:validate!)
+        end
 
         subject.exec
       end
 
       it 'calls diff checks' do
-        expect_any_instance_of(Gitlab::Checks::DiffCheck).to receive(:validate!)
+        expect_next_instance_of(Gitlab::Checks::DiffCheck) do |instance|
+          expect(instance).to receive(:validate!)
+        end
 
         subject.exec
       end

spec/lib/gitlab/ci/build/credentials/factory_spec.rb

@@ -12,12 +12,16 @@ describe Gitlab::Ci::Build::Credentials::Factory do
   end
 
   before do
-    allow_any_instance_of(described_class).to receive(:providers).and_return([TestProvider])
+    allow_next_instance_of(described_class) do |instance|
+      allow(instance).to receive(:providers).and_return([TestProvider])
+    end
   end
 
   context 'when provider is valid' do
     before do
-      allow_any_instance_of(TestProvider).to receive(:valid?).and_return(true)
+      allow_next_instance_of(TestProvider) do |instance|
+        allow(instance).to receive(:valid?).and_return(true)
+      end
     end
 
     it 'generates an array of credentials objects' do
@@ -29,7 +33,9 @@ describe Gitlab::Ci::Build::Credentials::Factory do
 
   context 'when provider is not valid' do
     before do
-      allow_any_instance_of(TestProvider).to receive(:valid?).and_return(false)
+      allow_next_instance_of(TestProvider) do |instance|
+        allow(instance).to receive(:valid?).and_return(false)
+      end
     end
 
     it 'generates an array without specific credential object' do

spec/lib/gitlab/ci/config/external/file/project_spec.rb

@@ -15,8 +15,9 @@ describe Gitlab::Ci::Config::External::File::Project do
   before do
     project.add_developer(user)
 
-    allow_any_instance_of(Gitlab::Ci::Config::External::Context)
-      .to receive(:check_execution_time!)
+    allow_next_instance_of(Gitlab::Ci::Config::External::Context) do |instance|
+      allow(instance).to receive(:check_execution_time!)
+    end
   end
 
   describe '#matching?' do
@@ -159,8 +160,8 @@ describe Gitlab::Ci::Config::External::File::Project do
   private
 
   def stub_project_blob(ref, path)
-    allow_any_instance_of(Repository)
-      .to receive(:blob_data_at)
-      .with(ref, path) { yield }
+    allow_next_instance_of(Repository) do |instance|
+      allow(instance).to receive(:blob_data_at).with(ref, path) { yield }
+    end
   end
 end

spec/lib/gitlab/ci/config/external/file/remote_spec.rb

@@ -21,8 +21,9 @@ describe Gitlab::Ci::Config::External::File::Remote do
   end
 
   before do
-    allow_any_instance_of(Gitlab::Ci::Config::External::Context)
-      .to receive(:check_execution_time!)
+    allow_next_instance_of(Gitlab::Ci::Config::External::Context) do |instance|
+      allow(instance).to receive(:check_execution_time!)
+    end
   end
 
   describe '#matching?' do

spec/lib/gitlab/ci/config/external/file/template_spec.rb

@@ -14,8 +14,9 @@ describe Gitlab::Ci::Config::External::File::Template do
   let(:template_file) { described_class.new(params, context) }
 
   before do
-    allow_any_instance_of(Gitlab::Ci::Config::External::Context)
-      .to receive(:check_execution_time!)
+    allow_next_instance_of(Gitlab::Ci::Config::External::Context) do |instance|
+      allow(instance).to receive(:check_execution_time!)
+    end
   end
 
   describe '#matching?' do

spec/lib/gitlab/ci/config/external/mapper_spec.rb

@@ -23,8 +23,9 @@ describe Gitlab::Ci::Config::External::Mapper do
   before do
     stub_full_request(remote_url).to_return(body: file_content)
 
-    allow_any_instance_of(Gitlab::Ci::Config::External::Context)
-      .to receive(:check_execution_time!)
+    allow_next_instance_of(Gitlab::Ci::Config::External::Context) do |instance|
+      allow(instance).to receive(:check_execution_time!)
+    end
   end
 
   describe '#process' do

spec/lib/gitlab/ci/config_spec.rb

@@ -8,8 +8,9 @@ describe Gitlab::Ci::Config do
   set(:user) { create(:user) }
 
   before do
-    allow_any_instance_of(Gitlab::Ci::Config::External::Context)
-      .to receive(:check_execution_time!)
+    allow_next_instance_of(Gitlab::Ci::Config::External::Context) do |instance|
+      allow(instance).to receive(:check_execution_time!)
+    end
   end
 
   let(:config) do
@@ -358,18 +359,11 @@ describe Gitlab::Ci::Config do
 
     context "when it takes too long to evaluate includes" do
       before do
-        allow_any_instance_of(Gitlab::Ci::Config::External::Context)
-          .to receive(:check_execution_time!)
-          .and_call_original
-
-        allow_any_instance_of(Gitlab::Ci::Config::External::Context)
-          .to receive(:set_deadline)
-          .with(described_class::TIMEOUT_SECONDS)
-          .and_call_original
-
-        allow_any_instance_of(Gitlab::Ci::Config::External::Context)
-          .to receive(:execution_expired?)
-          .and_return(true)
+        allow_next_instance_of(Gitlab::Ci::Config::External::Context) do |instance|
+          allow(instance).to receive(:check_execution_time!).and_call_original
+          allow(instance).to receive(:set_deadline).with(described_class::TIMEOUT_SECONDS).and_call_original
+          allow(instance).to receive(:execution_expired?).and_return(true)
+        end
       end
 
       it 'raises error TimeoutError' do
@@ -384,9 +378,9 @@ describe Gitlab::Ci::Config do
 
     context 'when context expansion timeout is disabled' do
       before do
-        allow_any_instance_of(Gitlab::Ci::Config::External::Context)
-          .to receive(:check_execution_time!)
-          .and_call_original
+        allow_next_instance_of(Gitlab::Ci::Config::External::Context) do |instance|
+          allow(instance).to receive(:check_execution_time!).and_call_original
+        end
 
         allow(Feature)
           .to receive(:enabled?)

spec/lib/gitlab/ci/pipeline/seed/stage_spec.rb

@@ -81,7 +81,9 @@ describe Gitlab::Ci::Pipeline::Seed::Stage do
 
     context 'when a ref is protected' do
       before do
-        allow_any_instance_of(Project).to receive(:protected_for?).and_return(true)
+        allow_next_instance_of(Project) do |instance|
+          allow(instance).to receive(:protected_for?).and_return(true)
+        end
       end
 
       it 'returns protected builds' do
@@ -91,7 +93,9 @@ describe Gitlab::Ci::Pipeline::Seed::Stage do
 
     context 'when a ref is not protected' do
       before do
-        allow_any_instance_of(Project).to receive(:protected_for?).and_return(false)
+        allow_next_instance_of(Project) do |instance|
+          allow(instance).to receive(:protected_for?).and_return(false)
+        end
       end
 
       it 'returns unprotected builds' do

spec/lib/gitlab/ci/trace/chunked_io_spec.rb

@@ -112,8 +112,9 @@ describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
       end
 
       it 'calls get_chunk only once' do
-        expect_any_instance_of(Gitlab::Ci::Trace::ChunkedIO)
-          .to receive(:current_chunk).once.and_call_original
+        expect_next_instance_of(Gitlab::Ci::Trace::ChunkedIO) do |instance|
+          expect(instance).to receive(:current_chunk).once.and_call_original
+        end
 
         chunked_io.each_line { |line| }
       end

spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb

@@ -9,7 +9,9 @@ shared_examples 'base stage' do
 
   before do
     allow(stage).to receive(:project_median).and_return(1.12)
-    allow_any_instance_of(Gitlab::CycleAnalytics::BaseEventFetcher).to receive(:event_result).and_return({})
+    allow_next_instance_of(Gitlab::CycleAnalytics::BaseEventFetcher) do |instance|
+      allow(instance).to receive(:event_result).and_return({})
+    end
   end
 
   it 'has the median data value' do

spec/lib/gitlab/cycle_analytics/usage_data_spec.rb

@@ -17,7 +17,9 @@ describe Gitlab::CycleAnalytics::UsageData do
         projects.each_with_index do |project, time|
           issue = create(:issue, project: project, created_at: (time + 1).hour.ago)
 
-          allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue])
+          allow_next_instance_of(Gitlab::ReferenceExtractor) do |instance|
+            allow(instance).to receive(:issues).and_return([issue])
+          end
 
           milestone = create(:milestone, project: project)
           mr = create_merge_request_closing_issue(user, project, issue, commit_message: "References #{issue.to_reference}")

spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb

@@ -10,17 +10,25 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do
 
   describe '#diff_files' do
     it 'does not highlight binary files' do
-      allow_any_instance_of(Gitlab::Diff::File).to receive(:text?).and_return(false)
+      allow_next_instance_of(Gitlab::Diff::File) do |instance|
+        allow(instance).to receive(:text?).and_return(false)
+      end
 
-      expect_any_instance_of(Gitlab::Diff::File).not_to receive(:highlighted_diff_lines)
+      expect_next_instance_of(Gitlab::Diff::File) do |instance|
+        expect(instance).not_to receive(:highlighted_diff_lines)
+      end
 
       diff_files
     end
 
     it 'does not highlight files marked as undiffable in .gitattributes' do
-      allow_any_instance_of(Gitlab::Diff::File).to receive(:diffable?).and_return(false)
+      allow_next_instance_of(Gitlab::Diff::File) do |instance|
+        allow(instance).to receive(:diffable?).and_return(false)
+      end
 
-      expect_any_instance_of(Gitlab::Diff::File).not_to receive(:highlighted_diff_lines)
+      expect_next_instance_of(Gitlab::Diff::File) do |instance|
+        expect(instance).not_to receive(:highlighted_diff_lines)
+      end
 
       diff_files
     end

spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb

@@ -95,7 +95,9 @@ describe Gitlab::Email::Handler::CreateMergeRequestHandler do
     context "something is wrong" do
       context "when the merge request could not be saved" do
         before do
-          allow_any_instance_of(MergeRequest).to receive(:save).and_return(false)
+          allow_next_instance_of(MergeRequest) do |instance|
+            allow(instance).to receive(:save).and_return(false)
+          end
         end
 
         it "raises an InvalidMergeRequestError" do

spec/lib/gitlab/etag_caching/middleware_spec.rb

@@ -38,8 +38,9 @@ describe Gitlab::EtagCaching::Middleware do
     end
 
     it 'generates ETag' do
-      expect_any_instance_of(Gitlab::EtagCaching::Store)
-        .to receive(:touch).and_return('123')
+      expect_next_instance_of(Gitlab::EtagCaching::Store) do |instance|
+        expect(instance).to receive(:touch).and_return('123')
+      end
 
       middleware.call(build_request(path, if_none_match))
     end
@@ -177,9 +178,9 @@ describe Gitlab::EtagCaching::Middleware do
         'SCRIPT_NAME' => '/relative-gitlab'
       }
 
-      expect_any_instance_of(Gitlab::EtagCaching::Store)
-        .to receive(:get).with("/relative-gitlab#{enabled_path}")
-        .and_return(nil)
+      expect_next_instance_of(Gitlab::EtagCaching::Store) do |instance|
+        expect(instance).to receive(:get).with("/relative-gitlab#{enabled_path}").and_return(nil)
+      end
 
       middleware.call(env)
     end
@@ -190,8 +191,9 @@ describe Gitlab::EtagCaching::Middleware do
   end
 
   def mock_value_in_store(value)
-    allow_any_instance_of(Gitlab::EtagCaching::Store)
-      .to receive(:get).and_return(value)
+    allow_next_instance_of(Gitlab::EtagCaching::Store) do |instance|
+      allow(instance).to receive(:get).and_return(value)
+    end
   end
 
   def build_request(path, if_none_match)

spec/lib/gitlab/experimentation_spec.rb

@@ -158,7 +158,9 @@ describe Gitlab::Experimentation do
 
         context 'the user is part of the control group' do
           before do
-            allow_any_instance_of(described_class).to receive(:experiment_enabled?).with(:test_experiment).and_return(false)
+            allow_next_instance_of(described_class) do |instance|
+              allow(instance).to receive(:experiment_enabled?).with(:test_experiment).and_return(false)
+            end
           end
 
           it 'pushes the right parameters to gon' do

spec/lib/gitlab/fogbugz_import/client_spec.rb

@@ -20,6 +20,8 @@ describe Gitlab::FogbugzImport::Client do
   end
 
   def stub_api(users)
-    allow_any_instance_of(::Fogbugz::Interface).to receive(:command).with(:listPeople).and_return(users)
+    allow_next_instance_of(::Fogbugz::Interface) do |instance|
+      allow(instance).to receive(:command).with(:listPeople).and_return(users)
+    end
   end
 end

spec/lib/gitlab/git/blob_spec.rb

@@ -134,7 +134,9 @@ describe Gitlab::Git::Blob, :seed_helper do
 
   describe '.find with Rugged enabled', :enable_rugged do
     it 'calls out to the Rugged implementation' do
-      allow_any_instance_of(Rugged).to receive(:rev_parse).with(SeedRepo::Commit::ID).and_call_original
+      allow_next_instance_of(Rugged) do |instance|
+        allow(instance).to receive(:rev_parse).with(SeedRepo::Commit::ID).and_call_original
+      end
 
       described_class.find(repository, SeedRepo::Commit::ID, 'files/images/6049019_460s.jpg')
     end

spec/lib/gitlab/git/commit_spec.rb

@@ -176,7 +176,9 @@ describe Gitlab::Git::Commit, :seed_helper do
 
     describe '.find with Rugged enabled', :enable_rugged do
       it 'calls out to the Rugged implementation' do
-        allow_any_instance_of(Rugged).to receive(:rev_parse).with(SeedRepo::Commit::ID).and_call_original
+        allow_next_instance_of(Rugged) do |instance|
+          allow(instance).to receive(:rev_parse).with(SeedRepo::Commit::ID).and_call_original
+        end
 
         described_class.find(repository, SeedRepo::Commit::ID)
       end
@@ -438,7 +440,9 @@ describe Gitlab::Git::Commit, :seed_helper do
       it_should_behave_like '.batch_by_oid'
 
       it 'calls out to the Rugged implementation' do
-        allow_any_instance_of(Rugged).to receive(:rev_parse).with(SeedRepo::Commit::ID).and_call_original
+        allow_next_instance_of(Rugged) do |instance|
+          allow(instance).to receive(:rev_parse).with(SeedRepo::Commit::ID).and_call_original
+        end
 
         described_class.batch_by_oid(repository, [SeedRepo::Commit::ID])
       end

spec/lib/gitlab/git/tree_spec.rb

@@ -145,7 +145,9 @@ describe Gitlab::Git::Tree, :seed_helper do
 
   describe '.where with Rugged enabled', :enable_rugged do
     it 'calls out to the Rugged implementation' do
-      allow_any_instance_of(Rugged).to receive(:lookup).with(SeedRepo::Commit::ID)
+      allow_next_instance_of(Rugged) do |instance|
+        allow(instance).to receive(:lookup).with(SeedRepo::Commit::ID)
+      end
 
       described_class.where(repository, SeedRepo::Commit::ID, 'files', false)
     end

spec/lib/gitlab/git_access_spec.rb

@@ -730,7 +730,9 @@ describe Gitlab::GitAccess do
       it 'checks LFS integrity only for first change' do
         allow(project).to receive(:lfs_enabled?).and_return(true)
 
-        expect_any_instance_of(Gitlab::Checks::LfsIntegrity).to receive(:objects_missing?).exactly(1).times
+        expect_next_instance_of(Gitlab::Checks::LfsIntegrity) do |instance|
+          expect(instance).to receive(:objects_missing?).exactly(1).times
+        end
 
         push_access_check
       end

spec/lib/gitlab/gitaly_client/cleanup_service_spec.rb

@@ -10,10 +10,11 @@ describe Gitlab::GitalyClient::CleanupService do
 
   describe '#apply_bfg_object_map_stream' do
     it 'sends an apply_bfg_object_map_stream message' do
-      expect_any_instance_of(Gitaly::CleanupService::Stub)
-        .to receive(:apply_bfg_object_map_stream)
-        .with(kind_of(Enumerator), kind_of(Hash))
-        .and_return([])
+      expect_next_instance_of(Gitaly::CleanupService::Stub) do |instance|
+        expect(instance).to receive(:apply_bfg_object_map_stream)
+          .with(kind_of(Enumerator), kind_of(Hash))
+          .and_return([])
+      end
 
       client.apply_bfg_object_map_stream(StringIO.new)
     end

spec/lib/gitlab/gitaly_client_spec.rb

@@ -55,7 +55,9 @@ describe Gitlab::GitalyClient do
     it 'returns an empty string when the storage is not found in the response' do
       response = double("response")
       allow(response).to receive(:storage_statuses).and_return([])
-      allow_any_instance_of(Gitlab::GitalyClient::ServerService).to receive(:info).and_return(response)
+      allow_next_instance_of(Gitlab::GitalyClient::ServerService) do |instance|
+        allow(instance).to receive(:info).and_return(response)
+      end
 
       expect(described_class.filesystem_id('default')).to eq(nil)
     end

spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb

@@ -144,9 +144,9 @@ describe Gitlab::GithubImport::Importer::DiffNoteImporter do
 
   describe '#find_merge_request_id' do
     it 'returns a merge request ID' do
-      expect_any_instance_of(Gitlab::GithubImport::IssuableFinder)
-        .to receive(:database_id)
-        .and_return(10)
+      expect_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |instance|
+        expect(instance).to receive(:database_id).and_return(10)
+      end
 
       expect(importer.find_merge_request_id).to eq(10)
     end

spec/lib/gitlab/github_import/importer/label_links_importer_spec.rb

@@ -74,9 +74,9 @@ describe Gitlab::GithubImport::Importer::LabelLinksImporter do
 
   describe '#find_target_id' do
     it 'returns the ID of the issuable to create the label link for' do
-      expect_any_instance_of(Gitlab::GithubImport::IssuableFinder)
-        .to receive(:database_id)
-        .and_return(10)
+      expect_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |instance|
+        expect(instance).to receive(:database_id).and_return(10)
+      end
 
       expect(importer.find_target_id).to eq(10)
     end

spec/lib/gitlab/github_import/importer/labels_importer_spec.rb

@@ -50,8 +50,9 @@ describe Gitlab::GithubImport::Importer::LabelsImporter, :clean_gitlab_redis_cac
 
   describe '#build_labels_cache' do
     it 'builds the labels cache' do
-      expect_any_instance_of(Gitlab::GithubImport::LabelFinder)
-        .to receive(:build_cache)
+      expect_next_instance_of(Gitlab::GithubImport::LabelFinder) do |instance|
+        expect(instance).to receive(:build_cache)
+      end
 
       importer.build_labels_cache
     end

spec/lib/gitlab/github_import/importer/milestones_importer_spec.rb

@@ -80,8 +80,9 @@ describe Gitlab::GithubImport::Importer::MilestonesImporter, :clean_gitlab_redis
 
   describe '#build_milestones_cache' do
     it 'builds the milestones cache' do
-      expect_any_instance_of(Gitlab::GithubImport::MilestoneFinder)
-        .to receive(:build_cache)
+      expect_next_instance_of(Gitlab::GithubImport::MilestoneFinder) do |instance|
+        expect(instance).to receive(:build_cache)
+      end
 
       importer.build_milestones_cache
     end

spec/lib/gitlab/github_import/importer/note_importer_spec.rb

@@ -143,9 +143,9 @@ describe Gitlab::GithubImport::Importer::NoteImporter do
 
   describe '#find_noteable_id' do
     it 'returns the ID of the noteable' do
-      expect_any_instance_of(Gitlab::GithubImport::IssuableFinder)
-        .to receive(:database_id)
-        .and_return(10)
+      expect_next_instance_of(Gitlab::GithubImport::IssuableFinder) do |instance|
+        expect(instance).to receive(:database_id).and_return(10)
+      end
 
       expect(importer.find_noteable_id).to eq(10)
     end

spec/lib/gitlab/github_import/sequential_importer_spec.rb

@@ -9,8 +9,9 @@ describe Gitlab::GithubImport::SequentialImporter do
       project = double(:project, id: 1, repository: repository)
       importer = described_class.new(project, token: 'foo')
 
-      expect_any_instance_of(Gitlab::GithubImport::Importer::RepositoryImporter)
-        .to receive(:execute)
+      expect_next_instance_of(Gitlab::GithubImport::Importer::RepositoryImporter) do |instance|
+        expect(instance).to receive(:execute)
+      end
 
       described_class::SEQUENTIAL_IMPORTERS.each do |klass|
         instance = double(:instance)

spec/lib/gitlab/gitlab_import/client_spec.rb

@@ -21,18 +21,24 @@ describe Gitlab::GitlabImport::Client do
   it 'uses membership and simple flags' do
     stub_request('/api/v4/projects?membership=true&page=1&per_page=100&simple=true')
 
-    expect_any_instance_of(OAuth2::Response).to receive(:parsed).and_return([])
+    expect_next_instance_of(OAuth2::Response) do |instance|
+      expect(instance).to receive(:parsed).and_return([])
+    end
 
     expect(client.projects.to_a).to eq []
   end
 
   shared_examples 'pagination params' do
     before do
-      allow_any_instance_of(OAuth2::Response).to receive(:parsed).and_return([])
+      allow_next_instance_of(OAuth2::Response) do |instance|
+        allow(instance).to receive(:parsed).and_return([])
+      end
     end
 
     it 'allows page_limit param' do
-      allow_any_instance_of(OAuth2::Response).to receive(:parsed).and_return(element_list)
+      allow_next_instance_of(OAuth2::Response) do |instance|
+        allow(instance).to receive(:parsed).and_return(element_list)
+      end
 
       expect(client).to receive(:lazy_page_iterator).with(hash_including(page_limit: 2)).and_call_original
 

spec/lib/gitlab/http_io_spec.rb

@@ -109,7 +109,9 @@ describe Gitlab::HttpIO do
         end
 
         it 'calls get_chunk only once' do
-          expect_any_instance_of(Net::HTTP).to receive(:request).once.and_call_original
+          expect_next_instance_of(Net::HTTP) do |instance|
+            expect(instance).to receive(:request).once.and_call_original
+          end
 
           http_io.each_line { |line| }
         end

spec/lib/gitlab/request_context_spec.rb

@@ -43,7 +43,9 @@ describe Gitlab::RequestContext do
         let(:ip) { '192.168.1.11' }
 
         before do
-          allow_any_instance_of(Rack::Request).to receive(:ip).and_return(ip)
+          allow_next_instance_of(Rack::Request) do |instance|
+            allow(instance).to receive(:ip).and_return(ip)
+          end
           described_class.new(app).call(env)
         end