Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/services/issues/build_service_spec.rb b/spec/services/issues/build_service_spec.rb
index 68b226b02da..93eef8a2732 100644
--- a/spec/services/issues/build_service_spec.rb
+++ b/spec/services/issues/build_service_spec.rb
@@ -147,5 +147,19 @@ RSpec.describe Issues::BuildService do
 
       expect(issue.milestone).to be_nil
     end
+
+    context 'setting issue type' do
+      it 'sets the issue_type on the issue' do
+        issue = build_issue(issue_type: 'incident')
+
+        expect(issue.issue_type).to eq('incident')
+      end
+
+      it 'defaults to issue if issue_type not given' do
+        issue = build_issue
+
+        expect(issue.issue_type).to eq('issue')
+      end
+    end
   end
 end