Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 8 deletions

diff --git a/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js b/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js
index 16d4459f597..e1546f74a59 100644
--- a/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js
+++ b/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js
@@ -1,6 +1,7 @@
 import { GlFormGroup } from '@gitlab/ui';
 import { mount, shallowMount } from '@vue/test-utils';
 import { nextTick } from 'vue';
+import { TYPE_ISSUE } from '~/issues/constants';
 import AddIssuableForm from '~/related_issues/components/add_issuable_form.vue';
 import IssueToken from '~/related_issues/components/issue_token.vue';
 import { issuableTypesMap, linkedIssueTypesMap, PathIdSeparator } from '~/related_issues/constants';
@@ -125,7 +126,7 @@ describe('AddIssuableForm', () => {
         wrapper = mount(AddIssuableForm, {
           propsData: {
             inputValue: '',
-            issuableType: issuableTypesMap.ISSUE,
+            issuableType: TYPE_ISSUE,
             pathIdSeparator,
             pendingReferences: [],
           },
@@ -156,9 +157,9 @@ describe('AddIssuableForm', () => {
 
     describe('categorized issuables', () => {
       it.each`
-        issuableType              | pathIdSeparator          | contextHeader          | contextFooter
-        ${issuableTypesMap.ISSUE} | ${PathIdSeparator.Issue} | ${'The current issue'} | ${'the following issues'}
-        ${issuableTypesMap.EPIC}  | ${PathIdSeparator.Epic}  | ${'The current epic'}  | ${'the following epics'}
+        issuableType             | pathIdSeparator          | contextHeader          | contextFooter
+        ${TYPE_ISSUE}            | ${PathIdSeparator.Issue} | ${'The current issue'} | ${'the following issues'}
+        ${issuableTypesMap.EPIC} | ${PathIdSeparator.Epic}  | ${'The current epic'}  | ${'the following epics'}
       `(
         'show header text as "$contextHeader" and footer text as "$contextFooter" issuableType is set to $issuableType',
         ({ issuableType, contextHeader, contextFooter }) => {
@@ -184,7 +185,7 @@ describe('AddIssuableForm', () => {
           propsData: {
             inputValue: '',
             showCategorizedIssues: true,
-            issuableType: issuableTypesMap.ISSUE,
+            issuableType: TYPE_ISSUE,
             pathIdSeparator,
             pendingReferences: [],
           },
diff --git a/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js b/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js
index 996b2406240..ff8d5073005 100644
--- a/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js
+++ b/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js
@@ -6,10 +6,10 @@ import {
   issuable2,
   issuable3,
 } from 'jest/issuable/components/related_issuable_mock_data';
+import { TYPE_ISSUE } from '~/issues/constants';
 import RelatedIssuesBlock from '~/related_issues/components/related_issues_block.vue';
 import AddIssuableForm from '~/related_issues/components/add_issuable_form.vue';
 import {
-  issuableTypesMap,
   linkedIssueTypesMap,
   linkedIssueTypesTextMap,
   PathIdSeparator,
@@ -34,7 +34,7 @@ describe('RelatedIssuesBlock', () => {
       wrapper = mountExtended(RelatedIssuesBlock, {
         propsData: {
           pathIdSeparator: PathIdSeparator.Issue,
-          issuableType: issuableTypesMap.ISSUE,
+          issuableType: TYPE_ISSUE,
         },
       });
     });
@@ -237,7 +237,7 @@ describe('RelatedIssuesBlock', () => {
         propsData: {
           pathIdSeparator: PathIdSeparator.Issue,
           relatedIssues: [issuable1, issuable2, issuable3],
-          issuableType: issuableTypesMap.ISSUE,
+          issuableType: TYPE_ISSUE,
         },
       });
     });