Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 10 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 e1546f74a59..72fcab63ba7 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,10 +1,10 @@
 import { GlFormGroup } from '@gitlab/ui';
 import { mount, shallowMount } from '@vue/test-utils';
 import { nextTick } from 'vue';
-import { TYPE_ISSUE } from '~/issues/constants';
+import { TYPE_EPIC, 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';
+import { linkedIssueTypesMap, PathIdSeparator } from '~/related_issues/constants';
 
 const issuable1 = {
   id: 200,
@@ -143,7 +143,7 @@ describe('AddIssuableForm', () => {
         wrapper = shallowMount(AddIssuableForm, {
           propsData: {
             inputValue: '',
-            issuableType: issuableTypesMap.EPIC,
+            issuableType: TYPE_EPIC,
             pathIdSeparator,
             pendingReferences: [],
           },
@@ -157,9 +157,9 @@ describe('AddIssuableForm', () => {
 
     describe('categorized issuables', () => {
       it.each`
-        issuableType             | pathIdSeparator          | contextHeader          | contextFooter
-        ${TYPE_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'}
+        ${TYPE_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 }) => {
diff --git a/spec/frontend/search/sidebar/components/app_spec.js b/spec/frontend/search/sidebar/components/app_spec.js
index 760c83a1dde..83302b90233 100644
--- a/spec/frontend/search/sidebar/components/app_spec.js
+++ b/spec/frontend/search/sidebar/components/app_spec.js
@@ -59,10 +59,7 @@ describe('GlobalSearchSidebar', () => {
       ${'blobs'}          | ${false}    | ${true}
     `('sidebar scope: $scope', ({ scope, showFilters, ShowsLanguage }) => {
       beforeEach(() => {
-        createComponent(
-          { urlQuery: { scope } },
-          { searchBlobsLanguageAggregation: true, searchPageVerticalNav: true },
-        );
+        createComponent({ urlQuery: { scope } }, { searchBlobsLanguageAggregation: true });
       });
 
       it(`${!showFilters ? "doesn't" : ''} shows filters`, () => {