1 files changed, 37 insertions, 49 deletions

diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index 94810d6134a..b073ffd291f 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -8,11 +8,17 @@ RSpec.describe Issues::CreateService do
   let_it_be_with_reload(:project) { create(:project) }
   let_it_be(:user) { create(:user) }
 
+  let(:spam_params) { double }
+
   describe '#execute' do
     let_it_be(:assignee) { create(:user) }
     let_it_be(:milestone) { create(:milestone, project: project) }
 
-    let(:issue) { described_class.new(project: project, current_user: user, params: opts).execute }
+    let(:issue) { described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute }
+
+    before do
+      stub_spam_services
+    end
 
     context 'when params are valid' do
       let_it_be(:labels) { create_pair(:label, project: project) }
@@ -44,7 +50,7 @@ RSpec.describe Issues::CreateService do
       end
 
       context 'when skip_system_notes is true' do
-        let(:issue) { described_class.new(project: project, current_user: user, params: opts).execute(skip_system_notes: true) }
+        let(:issue) { described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute(skip_system_notes: true) }
 
         it 'does not call Issuable::CommonSystemNotesService' do
           expect(Issuable::CommonSystemNotesService).not_to receive(:new)
@@ -92,7 +98,7 @@ RSpec.describe Issues::CreateService do
         let_it_be(:non_member) { create(:user) }
 
         it 'filters out params that cannot be set without the :set_issue_metadata permission' do
-          issue = described_class.new(project: project, current_user: non_member, params: opts).execute
+          issue = described_class.new(project: project, current_user: non_member, params: opts, spam_params: spam_params).execute
 
           expect(issue).to be_persisted
           expect(issue.title).to eq('Awesome issue')
@@ -104,7 +110,7 @@ RSpec.describe Issues::CreateService do
         end
 
         it 'can create confidential issues' do
-          issue = described_class.new(project: project, current_user: non_member, params: { confidential: true }).execute
+          issue = described_class.new(project: project, current_user: non_member, params: { confidential: true }, spam_params: spam_params).execute
 
           expect(issue.confidential).to be_truthy
         end
@@ -113,7 +119,7 @@ RSpec.describe Issues::CreateService do
       it 'moves the issue to the end, in an asynchronous worker' do
         expect(IssuePlacementWorker).to receive(:perform_async).with(be_nil, Integer)
 
-        described_class.new(project: project, current_user: user, params: opts).execute
+        described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
       end
 
       context 'when label belongs to project group' do
@@ -200,7 +206,7 @@ RSpec.describe Issues::CreateService do
         it 'invalidates open issues counter for assignees when issue is assigned' do
           project.add_maintainer(assignee)
 
-          described_class.new(project: project, current_user: user, params: opts).execute
+          described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
 
           expect(assignee.assigned_open_issues_count).to eq 1
         end
@@ -224,18 +230,18 @@ RSpec.describe Issues::CreateService do
         opts = { title: 'Title', description: 'Description', confidential: false }
 
         expect(project).to receive(:execute_hooks).with(an_instance_of(Hash), :issue_hooks)
-        expect(project).to receive(:execute_services).with(an_instance_of(Hash), :issue_hooks)
+        expect(project).to receive(:execute_integrations).with(an_instance_of(Hash), :issue_hooks)
 
-        described_class.new(project: project, current_user: user, params: opts).execute
+        described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
       end
 
       it 'executes confidential issue hooks when issue is confidential' do
         opts = { title: 'Title', description: 'Description', confidential: true }
 
         expect(project).to receive(:execute_hooks).with(an_instance_of(Hash), :confidential_issue_hooks)
-        expect(project).to receive(:execute_services).with(an_instance_of(Hash), :confidential_issue_hooks)
+        expect(project).to receive(:execute_integrations).with(an_instance_of(Hash), :confidential_issue_hooks)
 
-        described_class.new(project: project, current_user: user, params: opts).execute
+        described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
       end
 
       context 'after_save callback to store_mentions' do
@@ -279,7 +285,7 @@ RSpec.describe Issues::CreateService do
         it 'removes assignee when user id is invalid' do
           opts = { title: 'Title', description: 'Description', assignee_ids: [-1] }
 
-          issue = described_class.new(project: project, current_user: user, params: opts).execute
+          issue = described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
 
           expect(issue.assignees).to be_empty
         end
@@ -287,7 +293,7 @@ RSpec.describe Issues::CreateService do
         it 'removes assignee when user id is 0' do
           opts = { title: 'Title', description: 'Description', assignee_ids: [0] }
 
-          issue = described_class.new(project: project, current_user: user, params: opts).execute
+          issue = described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
 
           expect(issue.assignees).to be_empty
         end
@@ -296,7 +302,7 @@ RSpec.describe Issues::CreateService do
           project.add_maintainer(assignee)
           opts = { title: 'Title', description: 'Description', assignee_ids: [assignee.id] }
 
-          issue = described_class.new(project: project, current_user: user, params: opts).execute
+          issue = described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
 
           expect(issue.assignees).to eq([assignee])
         end
@@ -314,7 +320,7 @@ RSpec.describe Issues::CreateService do
               project.update!(visibility_level: level)
               opts = { title: 'Title', description: 'Description', assignee_ids: [assignee.id] }
 
-              issue = described_class.new(project: project, current_user: user, params: opts).execute
+              issue = described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
 
               expect(issue.assignees).to be_empty
             end
@@ -324,7 +330,7 @@ RSpec.describe Issues::CreateService do
     end
 
     it_behaves_like 'issuable record that supports quick actions' do
-      let(:issuable) { described_class.new(project: project, current_user: user, params: params).execute }
+      let(:issuable) { described_class.new(project: project, current_user: user, params: params, spam_params: spam_params).execute }
     end
 
     context 'Quick actions' do
@@ -364,14 +370,14 @@ RSpec.describe Issues::CreateService do
         let(:opts) { { discussion_to_resolve: discussion.id, merge_request_to_resolve_discussions_of: merge_request.iid } }
 
         it 'resolves the discussion' do
-          described_class.new(project: project, current_user: user, params: opts).execute
+          described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
           discussion.first_note.reload
 
           expect(discussion.resolved?).to be(true)
         end
 
         it 'added a system note to the discussion' do
-          described_class.new(project: project, current_user: user, params: opts).execute
+          described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
 
           reloaded_discussion = MergeRequest.find(merge_request.id).discussions.first
 
@@ -379,7 +385,7 @@ RSpec.describe Issues::CreateService do
         end
 
         it 'assigns the title and description for the issue' do
-          issue = described_class.new(project: project, current_user: user, params: opts).execute
+          issue = described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
 
           expect(issue.title).not_to be_nil
           expect(issue.description).not_to be_nil
@@ -391,7 +397,8 @@ RSpec.describe Issues::CreateService do
                                         merge_request_to_resolve_discussions_of: merge_request,
                                         description: nil,
                                         title: nil
-                                      }).execute
+                                      },
+                                      spam_params: spam_params).execute
 
           expect(issue.description).to be_nil
           expect(issue.title).to be_nil
@@ -402,14 +409,14 @@ RSpec.describe Issues::CreateService do
         let(:opts) { { merge_request_to_resolve_discussions_of: merge_request.iid } }
 
         it 'resolves the discussion' do
-          described_class.new(project: project, current_user: user, params: opts).execute
+          described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
           discussion.first_note.reload
 
           expect(discussion.resolved?).to be(true)
         end
 
         it 'added a system note to the discussion' do
-          described_class.new(project: project, current_user: user, params: opts).execute
+          described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
 
           reloaded_discussion = MergeRequest.find(merge_request.id).discussions.first
 
@@ -417,7 +424,7 @@ RSpec.describe Issues::CreateService do
         end
 
         it 'assigns the title and description for the issue' do
-          issue = described_class.new(project: project, current_user: user, params: opts).execute
+          issue = described_class.new(project: project, current_user: user, params: opts, spam_params: spam_params).execute
 
           expect(issue.title).not_to be_nil
           expect(issue.description).not_to be_nil
@@ -429,7 +436,8 @@ RSpec.describe Issues::CreateService do
                                         merge_request_to_resolve_discussions_of: merge_request,
                                         description: nil,
                                         title: nil
-                                      }).execute
+                                      },
+                                      spam_params: spam_params).execute
 
           expect(issue.description).to be_nil
           expect(issue.title).to be_nil
@@ -438,47 +446,27 @@ RSpec.describe Issues::CreateService do
     end
 
     context 'checking spam' do
-      let(:request) { double(:request, headers: nil) }
-      let(:api) { true }
-      let(:captcha_response) { 'abc123' }
-      let(:spam_log_id) { 1 }
-
       let(:params) do
         {
-          title: 'Spam issue',
-          request: request,
-          api: api,
-          captcha_response: captcha_response,
-          spam_log_id: spam_log_id
+          title: 'Spam issue'
         }
       end
 
       subject do
-        described_class.new(project: project, current_user: user, params: params)
-      end
-
-      before do
-        allow_next_instance_of(UserAgentDetailService) do |instance|
-          allow(instance).to receive(:create)
-        end
+        described_class.new(project: project, current_user: user, params: params, spam_params: spam_params)
       end
 
       it 'executes SpamActionService' do
-        spam_params = Spam::SpamParams.new(
-          api: api,
-          captcha_response: captcha_response,
-          spam_log_id: spam_log_id
-        )
         expect_next_instance_of(
           Spam::SpamActionService,
           {
-            spammable: an_instance_of(Issue),
-            request: request,
-            user: user,
+            spammable: kind_of(Issue),
+            spam_params: spam_params,
+            user: an_instance_of(User),
             action: :create
           }
         ) do |instance|
-          expect(instance).to receive(:execute).with(spam_params: spam_params)
+          expect(instance).to receive(:execute)
         end
 
         subject.execute