Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/services/auto_merge/base_service_spec.rb b/spec/services/auto_merge/base_service_spec.rb
index 1d33dc15838..3f535b83788 100644
--- a/spec/services/auto_merge/base_service_spec.rb
+++ b/spec/services/auto_merge/base_service_spec.rb
@@ -84,7 +84,7 @@ RSpec.describe AutoMerge::BaseService do
 
     context 'when failed to save merge request' do
       before do
-        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid }
       end
 
       it 'does not yield block' do
@@ -195,7 +195,7 @@ RSpec.describe AutoMerge::BaseService do
 
     context 'when failed to save' do
       before do
-        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid }
       end
 
       it 'does not yield block' do
@@ -213,7 +213,7 @@ RSpec.describe AutoMerge::BaseService do
 
     context 'when failed to save merge request' do
       before do
-        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid }
       end
 
       it 'returns error status' do
@@ -260,7 +260,7 @@ RSpec.describe AutoMerge::BaseService do
 
     context 'when failed to save' do
       before do
-        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid.new }
+        allow(merge_request).to receive(:save!) { raise ActiveRecord::RecordInvalid }
       end
 
       it 'returns error status' do