Merge branch '6022-ee-extract-slash_commands' into 'master'

Resolve "Extract EE specific files/lines for lib/gitlab/slash_commands"

Closes #6022

See merge request gitlab-org/gitlab-ee!5849

ee/lib/ee/gitlab/slash_commands/command.rb

+module EE
+  module Gitlab
+    module SlashCommands
+      module Command
+        extend ActiveSupport::Concern
+
+        class_methods do
+          extend ::Gitlab::Utils::Override
+          override :commands
+
+          def commands
+            super.concat(
+              [
+                ::Gitlab::SlashCommands::Run
+              ]
+            )
+          end
+        end
+      end
+    end
+  end
+end

ee/lib/ee/gitlab/slash_commands/presenters/issue_base.rb

+module EE
+  module Gitlab
+    module SlashCommands
+      module Presenters
+        module IssueBase
+          extend ::Gitlab::Utils::Override
+
+          override :fields
+          def fields
+            super.concat(
+              [
+                {
+                  title: "Weight",
+                  value: resource.weight? ? resource.weight : "_None_",
+                  short: true
+                }
+              ]
+            )
+          end
+        end
+      end
+    end
+  end
+end

ee/lib/gitlab/slash_commands/application_help.rb

@@ -16,7 +16,7 @@ module Gitlab
       end
 
       def commands
-        Gitlab::SlashCommands::Command::COMMANDS
+        Gitlab::SlashCommands::Command.commands
       end
     end
   end

ee/spec/lib/gitlab/slash_commands/command_spec.rb

+require 'spec_helper'
+
+describe Gitlab::SlashCommands::Command do
+  describe '.commands' do
+    it 'includes EE specific commands' do
+      expect(described_class.commands).to include(Gitlab::SlashCommands::Run)
+    end
+  end
+end

ee/spec/lib/gitlab/slash_commands/presenters/issue_show_spec.rb

+require 'spec_helper'
+
+describe Gitlab::SlashCommands::Presenters::IssueShow do
+  let(:project) { create(:project) }
+  let(:attachment) { subject[:attachments].first }
+
+  subject { described_class.new(issue).present }
+
+  context 'issue with issue weight' do
+    let(:issue) { create(:issue, project: project, weight: 3) }
+    let(:weight_attachment) { attachment[:fields].find { |a| a[:title] == "Weight" } }
+
+    it 'shows the weight' do
+      expect(weight_attachment).not_to be_nil
+      expect(weight_attachment[:value]).to be(3)
+    end
+  end
+end

lib/gitlab/slash_commands/command.rb

 module Gitlab
   module SlashCommands
     class Command < BaseCommand
-      COMMANDS = [
-        Gitlab::SlashCommands::IssueShow,
-        Gitlab::SlashCommands::IssueNew,
-        Gitlab::SlashCommands::IssueSearch,
-        Gitlab::SlashCommands::IssueMove,
-        Gitlab::SlashCommands::Deploy,
-        Gitlab::SlashCommands::Run
-      ].freeze
+      prepend EE::Gitlab::SlashCommands::Command
+
+      def self.commands
+        [
+          Gitlab::SlashCommands::IssueShow,
+          Gitlab::SlashCommands::IssueNew,
+          Gitlab::SlashCommands::IssueSearch,
+          Gitlab::SlashCommands::IssueMove,
+          Gitlab::SlashCommands::Deploy
+        ]
+      end
 
       def execute
         command, match = match_command
@@ -38,7 +41,7 @@ module Gitlab
       private
 
       def available_commands
-        COMMANDS.select do |klass|
+        self.class.commands.keep_if do |klass|
           klass.available?(project)
         end
       end

lib/gitlab/slash_commands/presenters/issue_base.rb

@@ -2,6 +2,8 @@ module Gitlab
   module SlashCommands
     module Presenters
       module IssueBase
+        prepend EE::Gitlab::SlashCommands::Presenters::IssueBase
+
         def color(issuable)
           issuable.open? ? '#38ae67' : '#d22852'
         end
@@ -34,11 +36,6 @@ module Gitlab
               title: "Labels",
               value: resource.labels.any? ? resource.label_names.join(', ') : "_None_",
               short: true
-            },
-            {
-              title: "Weight",
-              value: resource.weight? ? resource.weight : "_None_",
-              short: true
             }
           ]
         end

spec/lib/gitlab/slash_commands/presenters/issue_show_spec.rb

@@ -49,14 +49,4 @@ describe Gitlab::SlashCommands::Presenters::IssueShow do
       expect(attachment[:text]).to start_with("**Open**")
     end
   end
-
-  context 'issue with issue weight' do
-    let(:issue) { create(:issue, project: project, weight: 3) }
-    let(:weight_attachment) { subject[:attachments].first[:fields].find { |a| a[:title] == "Weight" } }
-
-    it 'shows the weight' do
-      expect(weight_attachment).not_to be_nil
-      expect(weight_attachment[:value]).to be(3)
-    end
-  end
 end