Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/lib/gitlab/jira_import/issue_serializer_spec.rb b/spec/lib/gitlab/jira_import/issue_serializer_spec.rb
index 198d2db234c..f93835f4429 100644
--- a/spec/lib/gitlab/jira_import/issue_serializer_spec.rb
+++ b/spec/lib/gitlab/jira_import/issue_serializer_spec.rb
@@ -11,6 +11,7 @@ RSpec.describe Gitlab::JiraImport::IssueSerializer do
     let_it_be(:group_label) { create(:group_label, group: group, title: 'dev') }
     let_it_be(:current_user) { create(:user) }
     let_it_be(:user) { create(:user) }
+    let_it_be(:issue_type_id) { WorkItems::Type.default_issue_type.id }
 
     let(:iid) { 5 }
     let(:key) { 'PROJECT-5' }
@@ -54,7 +55,7 @@ RSpec.describe Gitlab::JiraImport::IssueSerializer do
 
     let(:params) { { iid: iid } }
 
-    subject { described_class.new(project, jira_issue, current_user.id, params).execute }
+    subject { described_class.new(project, jira_issue, current_user.id, issue_type_id, params).execute }
 
     let(:expected_description) do
       <<~MD
@@ -81,7 +82,8 @@ RSpec.describe Gitlab::JiraImport::IssueSerializer do
           created_at: created_at,
           author_id: current_user.id,
           assignee_ids: nil,
-          label_ids: [project_label.id, group_label.id] + Label.reorder(id: :asc).last(2).pluck(:id)
+          label_ids: [project_label.id, group_label.id] + Label.reorder(id: :asc).last(2).pluck(:id),
+          work_item_type_id: issue_type_id
         )
       end