Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 3 deletions

diff --git a/spec/frontend/search/sidebar/components/scope_legacy_navigation_spec.js b/spec/frontend/search/sidebar/components/scope_legacy_navigation_spec.js
index 6a94da31a1b..786ad806ea6 100644
--- a/spec/frontend/search/sidebar/components/scope_legacy_navigation_spec.js
+++ b/spec/frontend/search/sidebar/components/scope_legacy_navigation_spec.js
@@ -7,6 +7,8 @@ import ScopeLegacyNavigation from '~/search/sidebar/components/scope_legacy_navi
 
 Vue.use(Vuex);
 
+const MOCK_NAVIGATION_ENTRIES = Object.entries(MOCK_NAVIGATION);
+
 describe('ScopeLegacyNavigation', () => {
   let wrapper;
 
@@ -55,12 +57,12 @@ describe('ScopeLegacyNavigation', () => {
     });
 
     it('renders all nav item components', () => {
-      expect(findGlNavItems()).toHaveLength(9);
+      expect(findGlNavItems()).toHaveLength(MOCK_NAVIGATION_ENTRIES.length);
     });
 
     it('has all proper links', () => {
       const linkAtPosition = 3;
-      const { link } = MOCK_NAVIGATION[Object.keys(MOCK_NAVIGATION)[linkAtPosition]];
+      const { link } = MOCK_NAVIGATION_ENTRIES[linkAtPosition][1];
 
       expect(findGlNavItems().at(linkAtPosition).attributes('href')).toBe(link);
     });
diff --git a/spec/frontend/search/sidebar/components/scope_sidebar_navigation_spec.js b/spec/frontend/search/sidebar/components/scope_sidebar_navigation_spec.js
index 4b71ff0bedc..86939bdc5d6 100644
--- a/spec/frontend/search/sidebar/components/scope_sidebar_navigation_spec.js
+++ b/spec/frontend/search/sidebar/components/scope_sidebar_navigation_spec.js
@@ -7,6 +7,8 @@ import { MOCK_QUERY, MOCK_NAVIGATION, MOCK_NAVIGATION_ITEMS } from '../../mock_d
 
 Vue.use(Vuex);
 
+const MOCK_NAVIGATION_ENTRIES = Object.entries(MOCK_NAVIGATION);
+
 describe('ScopeSidebarNavigation', () => {
   let wrapper;
 
@@ -59,7 +61,7 @@ describe('ScopeSidebarNavigation', () => {
     });
 
     it('renders all nav item components', () => {
-      expect(findNavItems()).toHaveLength(9);
+      expect(findNavItems()).toHaveLength(MOCK_NAVIGATION_ENTRIES.length);
     });
 
     it('has all proper links', () => {