Merge branch '1968-fix-issue-build-service-with-templates' into 'master'

Build issues for merge request when there is an issue template

Closes #1968

See merge request !1550

app/controllers/projects/issues_controller.rb

@@ -77,11 +77,6 @@ class Projects::IssuesController < Projects::ApplicationController
     @merge_request_to_resolve_discussions_of = service.merge_request_to_resolve_discussions_of
     @discussion_to_resolve = service.discussions_to_resolve.first if params[:discussion_to_resolve]
 
-    # Set Issue description based on project template
-    if @project.issues_template.present?
-      @issue.description = @project.issues_template
-    end
-
     respond_with(@issue)
   end
 

app/services/issues/build_service.rb

@@ -7,6 +7,10 @@ module Issues
       @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
 
@@ -49,8 +53,13 @@ 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_with_info_from_discussions.merge(whitelisted_issue_params)
+      @issue_params ||= issue_params_from_template.
+                          merge(issue_params_with_info_from_discussions).
+                          merge(whitelisted_issue_params)
     end
 
     def whitelisted_issue_params

spec/services/issues/build_service_spec.rb

@@ -8,6 +8,19 @@ 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) }
@@ -25,6 +38,16 @@ 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