Only set issues template from setting if feature available

Only when the license allows Issuable Default Templates, set the issue
description when building an Issue.

Do this by splitting out EE-specific features into
EE::Issues::BuildService. And also split up spec files.

app/services/ee/issues/build_service.rb

+module EE
+  module Issues
+    module BuildService
+      def issue_params_from_template
+        return {} unless project.feature_available?(:issuable_default_templates)
+
+        { description: project.issues_template }
+      end
+
+      # Issue params can be built from 3 types of passed params,
+      # They take precedence over eachother like this
+      # passed params > discussion params > template params
+      # The template params are filled in here, and might be overwritten by super
+      def issue_params
+        @issue_params ||= issue_params_from_template.merge(super)
+      end
+    end
+  end
+end

app/services/issues/build_service.rb

 module Issues
   class BuildService < Issues::BaseService
     include ResolveDiscussions
+    prepend ::EE::Issues::BuildService
 
     def execute
       filter_resolve_discussion_params
       @issue = project.issues.new(issue_params)
     end
 
-    def issue_params_from_template
-      { description: project.issues_template }
-    end
-
     def issue_params_with_info_from_discussions
       return {} unless merge_request_to_resolve_discussions_of
 
@@ -58,13 +55,8 @@ module Issues
       [discussion_info, quote].join("\n\n")
     end
 
-    # Issue params can be built from 3 types of passed params,
-    # They take precedence over eachother like this
-    # passed params > discussion params > template params
     def issue_params
-      @issue_params ||= issue_params_from_template
-                          .merge(issue_params_with_info_from_discussions)
-                          .merge(whitelisted_issue_params)
+      @issue_params ||= issue_params_with_info_from_discussions.merge(whitelisted_issue_params)
     end
 
     def whitelisted_issue_params

spec/services/ee/issues/build_service_spec.rb

+require 'spec_helper.rb'
+
+describe Issues::BuildService, services: true do # rubocop:disable RSpec/FilePath
+  let(:project) { create(:project, :repository) }
+  let(:user) { create(:user) }
+
+  before do
+    project.team << [user, :developer]
+  end
+
+  context 'with an issue template' do
+    describe '#execute' do
+      it 'fills in the template in the description' do
+        project = build(:project, issues_template: 'Work hard, play hard!')
+        service = described_class.new(project, user)
+
+        issue = service.execute
+
+        expect(issue.description).to eq('Work hard, play hard!')
+      end
+    end
+  end
+
+  context 'for a single discussion' do
+    describe '#execute' do
+      let(:merge_request) { create(:merge_request, title: "Hello world", source_project: project) }
+      let(:discussion) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, note: "Almost done").to_discussion }
+      let(:service) { described_class.new(project, user, merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id) }
+
+      context 'with an issue template' do
+        let(:project) { create(:project, :repository, issues_template: 'Work hard, play hard!') }
+
+        it 'picks the discussion description over the issue template' do
+          issue = service.execute
+
+          expect(issue.description).to include('Almost done')
+        end
+      end
+    end
+  end
+end

spec/services/issues/build_service_spec.rb

@@ -8,19 +8,6 @@ describe Issues::BuildService, services: true do
     project.team << [user, :developer]
   end
 
-  context 'with an issue template' do
-    describe '#execute' do
-      it 'fills in the template in the description' do
-        project = build(:project, issues_template: 'Work hard, play hard!')
-        service = described_class.new(project, user)
-
-        issue = service.execute
-
-        expect(issue.description).to eq('Work hard, play hard!')
-      end
-    end
-  end
-
   context 'for a single discussion' do
     describe '#execute' do
       let(:merge_request) { create(:merge_request, title: "Hello world", source_project: project) }
@@ -38,16 +25,6 @@ describe Issues::BuildService, services: true do
 
         expect(issue.description).to include('Almost done')
       end
-
-      context 'with an issue template' do
-        let(:project) { create(:project, :repository, issues_template: 'Work hard, play hard!') }
-
-        it 'picks the discussion description over the issue template' do
-          issue = service.execute
-
-          expect(issue.description).to include('Almost done')
-        end
-      end
     end
   end