Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/services/merge_requests/post_merge_service_spec.rb b/spec/services/merge_requests/post_merge_service_spec.rb
index ffc86f68469..fff6ddf3928 100644
--- a/spec/services/merge_requests/post_merge_service_spec.rb
+++ b/spec/services/merge_requests/post_merge_service_spec.rb
@@ -56,9 +56,11 @@ describe MergeRequests::PostMergeService do
 
       issue = create(:issue, project: project)
       allow(merge_request).to receive(:visible_closing_issues_for).and_return([issue])
-      allow_any_instance_of(Issues::CloseService).to receive(:execute).with(issue, commit: merge_request).and_raise
+      expect_next_instance_of(Issues::CloseService) do |service|
+        allow(service).to receive(:execute).with(issue, commit: merge_request).and_raise(RuntimeError)
+      end
 
-      expect { described_class.new(project, user, {}).execute(merge_request) }.to raise_error
+      expect { described_class.new(project, user).execute(merge_request) }.to raise_error(RuntimeError)
 
       expect(merge_request.reload).to be_merged
     end