From a23b2e053dd20cdca420983b1a2ee2c2f541ad7d Mon Sep 17 00:00:00 2001
From: James Fargher <proglottis@gmail.com>
Date: Tue, 26 Mar 2019 12:21:50 +1300
Subject: [PATCH] Fix ChatOps Slack responder for gitlab.com

The responder method can only exist on a Service model subclass
---
 .../gitlab_slack_application_service.rb               |  4 ++++
 .../projects/slack_application_install_service.rb     |  4 ----
 ee/changelogs/unreleased/fix_chatops_responder.yml    |  5 +++++
 .../gitlab_slack_application_service_spec.rb          | 11 +++++++++++
 .../slack_application_install_service_spec.rb         |  8 --------
 5 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 ee/changelogs/unreleased/fix_chatops_responder.yml
 create mode 100644 ee/spec/models/project_services/gitlab_slack_application_service_spec.rb

diff --git a/ee/app/models/project_services/gitlab_slack_application_service.rb b/ee/app/models/project_services/gitlab_slack_application_service.rb
index 405b2a17ee5978..6e38e156d37cd4 100644
--- a/ee/app/models/project_services/gitlab_slack_application_service.rb
+++ b/ee/app/models/project_services/gitlab_slack_application_service.rb
@@ -40,4 +40,8 @@ def self.to_param
   def fields
     []
   end
+
+  def chat_responder
+    Gitlab::Chat::Responder::Slack
+  end
 end
diff --git a/ee/app/services/projects/slack_application_install_service.rb b/ee/app/services/projects/slack_application_install_service.rb
index e6b64e2d8f0e0e..a7c55be34cfe1f 100644
--- a/ee/app/services/projects/slack_application_install_service.rb
+++ b/ee/app/services/projects/slack_application_install_service.rb
@@ -30,10 +30,6 @@ def execute
       success
     end
 
-    def chat_responder
-      Gitlab::Chat::Responder::Slack
-    end
-
     private
 
     # rubocop: disable CodeReuse/ActiveRecord
diff --git a/ee/changelogs/unreleased/fix_chatops_responder.yml b/ee/changelogs/unreleased/fix_chatops_responder.yml
new file mode 100644
index 00000000000000..7202c402fac2e7
--- /dev/null
+++ b/ee/changelogs/unreleased/fix_chatops_responder.yml
@@ -0,0 +1,5 @@
+---
+title: Fix ChatOps Slack responder for gitlab.com
+merge_request: 10416
+author:
+type: fixed
diff --git a/ee/spec/models/project_services/gitlab_slack_application_service_spec.rb b/ee/spec/models/project_services/gitlab_slack_application_service_spec.rb
new file mode 100644
index 00000000000000..914a2d19c73da7
--- /dev/null
+++ b/ee/spec/models/project_services/gitlab_slack_application_service_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSlackApplicationService do
+  describe '#chat_responder' do
+    it 'returns the chat responder to use' do
+      expect(subject.chat_responder).to eq(Gitlab::Chat::Responder::Slack)
+    end
+  end
+end
diff --git a/ee/spec/services/projects/slack_application_install_service_spec.rb b/ee/spec/services/projects/slack_application_install_service_spec.rb
index 7ac6c8298337d2..e1e91e14ea992a 100644
--- a/ee/spec/services/projects/slack_application_install_service_spec.rb
+++ b/ee/spec/services/projects/slack_application_install_service_spec.rb
@@ -46,12 +46,4 @@ def expect_chat_name_is_created(project)
     expect_slack_integration_is_created(project)
     expect_chat_name_is_created(project)
   end
-
-  describe '#chat_responder' do
-    it 'returns the chat responder to use' do
-      srv = service
-
-      expect(srv.chat_responder).to eq(Gitlab::Chat::Responder::Slack)
-    end
-  end
 end
-- 
GitLab