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

1 files changed, 7 insertions, 7 deletions

diff --git a/spec/services/issues/build_service_spec.rb b/spec/services/issues/build_service_spec.rb
index 80fe2474ecd..3f506ec58b0 100644
--- a/spec/services/issues/build_service_spec.rb
+++ b/spec/services/issues/build_service_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper.rb'
+require 'spec_helper'
 
 RSpec.describe Issues::BuildService do
   let_it_be(:project) { create(:project, :repository) }
@@ -15,7 +15,7 @@ RSpec.describe Issues::BuildService do
   end
 
   def build_issue(issue_params = {})
-    described_class.new(project, user, issue_params).execute
+    described_class.new(project: project, current_user: user, params: issue_params).execute
   end
 
   context 'for a single discussion' do
@@ -41,7 +41,7 @@ RSpec.describe Issues::BuildService do
     describe '#items_for_discussions' do
       it 'has an item for each discussion' do
         create(:diff_note_on_merge_request, noteable: merge_request, project: merge_request.source_project, line_number: 13)
-        service = described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid)
+        service = described_class.new(project: project, current_user: user, params: { merge_request_to_resolve_discussions_of: merge_request.iid })
 
         service.execute
 
@@ -50,7 +50,7 @@ RSpec.describe Issues::BuildService do
     end
 
     describe '#item_for_discussion' do
-      let(:service) { described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid) }
+      let(:service) { described_class.new(project: project, current_user: user, params: { merge_request_to_resolve_discussions_of: merge_request.iid }) }
 
       it 'mentions the author of the note' do
         discussion = create(:diff_note_on_merge_request, author: create(:user, username: 'author')).to_discussion
@@ -184,9 +184,9 @@ RSpec.describe Issues::BuildService do
         end
 
         it 'cannot set invalid type' do
-          expect do
-            build_issue(issue_type: 'invalid type')
-          end.to raise_error(ArgumentError, "'invalid type' is not a valid issue_type")
+          issue = build_issue(issue_type: 'invalid type')
+
+          expect(issue).to be_issue
         end
       end
     end