1 files changed, 24 insertions, 16 deletions

diff --git a/spec/frontend/search/sidebar/components/app_spec.js b/spec/frontend/search/sidebar/components/app_spec.js
index 963b73aeae5..ba492833ec4 100644
--- a/spec/frontend/search/sidebar/components/app_spec.js
+++ b/spec/frontend/search/sidebar/components/app_spec.js
@@ -3,8 +3,9 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import { MOCK_QUERY } from 'jest/search/mock_data';
 import GlobalSearchSidebar from '~/search/sidebar/components/app.vue';
-import ResultsFilters from '~/search/sidebar/components/results_filters.vue';
-import ScopeNavigation from '~/search/sidebar/components/scope_navigation.vue';
+import IssuesFilters from '~/search/sidebar/components/issues_filters.vue';
+import ScopeLegacyNavigation from '~/search/sidebar/components/scope_legacy_navigation.vue';
+import ScopeSidebarNavigation from '~/search/sidebar/components/scope_sidebar_navigation.vue';
 import LanguageFilter from '~/search/sidebar/components/language_filter/index.vue';
 
 Vue.use(Vuex);
@@ -12,22 +13,16 @@ Vue.use(Vuex);
 describe('GlobalSearchSidebar', () => {
   let wrapper;
 
-  const actionSpies = {
-    applyQuery: jest.fn(),
-    resetQuery: jest.fn(),
-  };
-
   const getterSpies = {
     currentScope: jest.fn(() => 'issues'),
   };
 
-  const createComponent = (initialState, featureFlags) => {
+  const createComponent = (initialState = {}, featureFlags = {}) => {
     const store = new Vuex.Store({
       state: {
         urlQuery: MOCK_QUERY,
         ...initialState,
       },
-      actions: actionSpies,
       getters: getterSpies,
     });
 
@@ -42,14 +37,15 @@ describe('GlobalSearchSidebar', () => {
   };
 
   const findSidebarSection = () => wrapper.find('section');
-  const findFilters = () => wrapper.findComponent(ResultsFilters);
-  const findSidebarNavigation = () => wrapper.findComponent(ScopeNavigation);
+  const findFilters = () => wrapper.findComponent(IssuesFilters);
+  const findScopeLegacyNavigation = () => wrapper.findComponent(ScopeLegacyNavigation);
+  const findScopeSidebarNavigation = () => wrapper.findComponent(ScopeSidebarNavigation);
   const findLanguageAggregation = () => wrapper.findComponent(LanguageFilter);
 
   describe('renders properly', () => {
     describe('always', () => {
       beforeEach(() => {
-        createComponent({});
+        createComponent();
       });
       it(`shows section`, () => {
         expect(findSidebarSection().exists()).toBe(true);
@@ -77,12 +73,24 @@ describe('GlobalSearchSidebar', () => {
       });
     });
 
-    describe('renders navigation', () => {
+    describe.each`
+      currentScope | sidebarNavShown | legacyNavShown
+      ${'issues'}  | ${false}        | ${true}
+      ${''}        | ${false}        | ${false}
+      ${'issues'}  | ${true}         | ${false}
+      ${''}        | ${true}         | ${false}
+    `('renders navigation', ({ currentScope, sidebarNavShown, legacyNavShown }) => {
       beforeEach(() => {
-        createComponent({});
+        getterSpies.currentScope = jest.fn(() => currentScope);
+        createComponent({ useSidebarNavigation: sidebarNavShown });
       });
-      it('shows the vertical navigation', () => {
-        expect(findSidebarNavigation().exists()).toBe(true);
+
+      it(`${!legacyNavShown ? 'hides' : 'shows'} the legacy navigation`, () => {
+        expect(findScopeLegacyNavigation().exists()).toBe(legacyNavShown);
+      });
+
+      it(`${!sidebarNavShown ? 'hides' : 'shows'} the sidebar navigation`, () => {
+        expect(findScopeSidebarNavigation().exists()).toBe(sidebarNavShown);
       });
     });
   });