Add latest changes from gitlab-org/gitlab@masterogolowinski-master-patch-80898

2 files changed, 6 insertions, 2 deletions

diff --git a/spec/services/lfs/lock_file_service_spec.rb b/spec/services/lfs/lock_file_service_spec.rb
index 15dbc3231a3..2bd62b96083 100644
--- a/spec/services/lfs/lock_file_service_spec.rb
+++ b/spec/services/lfs/lock_file_service_spec.rb
@@ -54,7 +54,9 @@ describe Lfs::LockFileService do
 
       context 'when an error is raised' do
         it "doesn't succeed" do
-          allow_any_instance_of(described_class).to receive(:create_lock!).and_raise(StandardError)
+          allow_next_instance_of(described_class) do |instance|
+            allow(instance).to receive(:create_lock!).and_raise(StandardError)
+          end
 
           expect(subject.execute[:status]).to eq(:error)
         end
diff --git a/spec/services/lfs/locks_finder_service_spec.rb b/spec/services/lfs/locks_finder_service_spec.rb
index 0fc2c593d94..fdc60e2c03f 100644
--- a/spec/services/lfs/locks_finder_service_spec.rb
+++ b/spec/services/lfs/locks_finder_service_spec.rb
@@ -91,7 +91,9 @@ describe Lfs::LocksFinderService do
 
     context 'when an error is raised' do
       it "doesn't succeed" do
-        allow_any_instance_of(described_class).to receive(:find_locks).and_raise(StandardError)
+        allow_next_instance_of(described_class) do |instance|
+          allow(instance).to receive(:find_locks).and_raise(StandardError)
+        end
 
         result = subject.execute