Add latest changes from gitlab-org/gitlab@master

3 files changed, 231 insertions, 90 deletions

diff --git a/spec/frontend/search/sidebar/components/app_spec.js b/spec/frontend/search/sidebar/components/app_spec.js
index 89959feec39..b4e3388f067 100644
--- a/spec/frontend/search/sidebar/components/app_spec.js
+++ b/spec/frontend/search/sidebar/components/app_spec.js
@@ -1,11 +1,9 @@
-import { GlButton, GlLink } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 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 ConfidentialityFilter from '~/search/sidebar/components/confidentiality_filter.vue';
-import StatusFilter from '~/search/sidebar/components/status_filter.vue';
+import ResultsFilters from '~/search/sidebar/components/results_filters.vue';
 
 Vue.use(Vuex);
 
@@ -35,118 +33,49 @@ describe('GlobalSearchSidebar', () => {
     wrapper.destroy();
   });
 
-  const findSidebarForm = () => wrapper.find('form');
-  const findStatusFilter = () => wrapper.findComponent(StatusFilter);
-  const findConfidentialityFilter = () => wrapper.findComponent(ConfidentialityFilter);
-  const findApplyButton = () => wrapper.findComponent(GlButton);
-  const findResetLinkButton = () => wrapper.findComponent(GlLink);
+  const findSidebarSection = () => wrapper.find('section');
+  const findFilters = () => wrapper.findComponent(ResultsFilters);
 
-  describe('template', () => {
+  describe('renders properly', () => {
     describe('scope=projects', () => {
       beforeEach(() => {
         createComponent({ urlQuery: { ...MOCK_QUERY, scope: 'projects' } });
       });
 
-      it("doesn't render StatusFilter", () => {
-        expect(findStatusFilter().exists()).toBe(false);
+      it('shows section', () => {
+        expect(findSidebarSection().exists()).toBe(true);
       });
 
-      it("doesn't render ConfidentialityFilter", () => {
-        expect(findConfidentialityFilter().exists()).toBe(false);
-      });
-
-      it("doesn't render ApplyButton", () => {
-        expect(findApplyButton().exists()).toBe(false);
-      });
-    });
-
-    describe('scope=issues', () => {
-      beforeEach(() => {
-        createComponent({ urlQuery: MOCK_QUERY });
-      });
-      it('renders StatusFilter', () => {
-        expect(findStatusFilter().exists()).toBe(true);
-      });
-
-      it('renders ConfidentialityFilter', () => {
-        expect(findConfidentialityFilter().exists()).toBe(true);
-      });
-
-      it('renders ApplyButton', () => {
-        expect(findApplyButton().exists()).toBe(true);
-      });
-    });
-  });
-
-  describe('ApplyButton', () => {
-    describe('when sidebarDirty is false', () => {
-      beforeEach(() => {
-        createComponent({ sidebarDirty: false });
-      });
-
-      it('disables the button', () => {
-        expect(findApplyButton().attributes('disabled')).toBe('true');
+      it("doesn't shows filters", () => {
+        expect(findFilters().exists()).toBe(false);
       });
     });
 
-    describe('when sidebarDirty is true', () => {
+    describe('scope=merge_requests', () => {
       beforeEach(() => {
-        createComponent({ sidebarDirty: true });
+        createComponent({ urlQuery: { ...MOCK_QUERY, scope: 'merge_requests' } });
       });
 
-      it('enables the button', () => {
-        expect(findApplyButton().attributes('disabled')).toBe(undefined);
-      });
-    });
-  });
-
-  describe('ResetLinkButton', () => {
-    describe('with no filter selected', () => {
-      beforeEach(() => {
-        createComponent({ urlQuery: {} });
+      it('shows section', () => {
+        expect(findSidebarSection().exists()).toBe(true);
       });
 
-      it('does not render', () => {
-        expect(findResetLinkButton().exists()).toBe(false);
+      it('shows filters', () => {
+        expect(findFilters().exists()).toBe(true);
       });
     });
 
-    describe('with filter selected', () => {
+    describe('scope=issues', () => {
       beforeEach(() => {
         createComponent({ urlQuery: MOCK_QUERY });
       });
-
-      it('does render', () => {
-        expect(findResetLinkButton().exists()).toBe(true);
-      });
-    });
-
-    describe('with filter selected and user updated query back to default', () => {
-      beforeEach(() => {
-        createComponent({ urlQuery: MOCK_QUERY, query: {} });
+      it('shows section', () => {
+        expect(findSidebarSection().exists()).toBe(true);
       });
 
-      it('does render', () => {
-        expect(findResetLinkButton().exists()).toBe(true);
+      it('shows filters', () => {
+        expect(findFilters().exists()).toBe(true);
       });
     });
   });
-
-  describe('actions', () => {
-    beforeEach(() => {
-      createComponent({});
-    });
-
-    it('clicking ApplyButton calls applyQuery', () => {
-      findSidebarForm().trigger('submit');
-
-      expect(actionSpies.applyQuery).toHaveBeenCalled();
-    });
-
-    it('clicking ResetLinkButton calls resetQuery', () => {
-      findResetLinkButton().vm.$emit('click');
-
-      expect(actionSpies.resetQuery).toHaveBeenCalled();
-    });
-  });
 });
diff --git a/spec/frontend/search/sidebar/components/filters_spec.js b/spec/frontend/search/sidebar/components/filters_spec.js
new file mode 100644
index 00000000000..4f217709297
--- /dev/null
+++ b/spec/frontend/search/sidebar/components/filters_spec.js
@@ -0,0 +1,132 @@
+import { GlButton, GlLink } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import Vue from 'vue';
+import Vuex from 'vuex';
+import { MOCK_QUERY } from 'jest/search/mock_data';
+import ResultsFilters from '~/search/sidebar/components/results_filters.vue';
+import ConfidentialityFilter from '~/search/sidebar/components/confidentiality_filter.vue';
+import StatusFilter from '~/search/sidebar/components/status_filter.vue';
+
+Vue.use(Vuex);
+
+describe('GlobalSearchSidebarFilters', () => {
+  let wrapper;
+
+  const actionSpies = {
+    applyQuery: jest.fn(),
+    resetQuery: jest.fn(),
+  };
+
+  const createComponent = (initialState) => {
+    const store = new Vuex.Store({
+      state: {
+        urlQuery: MOCK_QUERY,
+        ...initialState,
+      },
+      actions: actionSpies,
+    });
+
+    wrapper = shallowMount(ResultsFilters, {
+      store,
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  const findSidebarForm = () => wrapper.find('form');
+  const findStatusFilter = () => wrapper.findComponent(StatusFilter);
+  const findConfidentialityFilter = () => wrapper.findComponent(ConfidentialityFilter);
+  const findApplyButton = () => wrapper.findComponent(GlButton);
+  const findResetLinkButton = () => wrapper.findComponent(GlLink);
+
+  describe('Renders correctly', () => {
+    beforeEach(() => {
+      createComponent({ urlQuery: MOCK_QUERY });
+    });
+    it('renders StatusFilter', () => {
+      expect(findStatusFilter().exists()).toBe(true);
+    });
+
+    it('renders ConfidentialityFilter', () => {
+      expect(findConfidentialityFilter().exists()).toBe(true);
+    });
+
+    it('renders ApplyButton', () => {
+      expect(findApplyButton().exists()).toBe(true);
+    });
+  });
+
+  describe('ApplyButton', () => {
+    describe('when sidebarDirty is false', () => {
+      beforeEach(() => {
+        createComponent({ sidebarDirty: false });
+      });
+
+      it('disables the button', () => {
+        expect(findApplyButton().attributes('disabled')).toBe('true');
+      });
+    });
+
+    describe('when sidebarDirty is true', () => {
+      beforeEach(() => {
+        createComponent({ sidebarDirty: true });
+      });
+
+      it('enables the button', () => {
+        expect(findApplyButton().attributes('disabled')).toBe(undefined);
+      });
+    });
+  });
+
+  describe('ResetLinkButton', () => {
+    describe('with no filter selected', () => {
+      beforeEach(() => {
+        createComponent({ urlQuery: {} });
+      });
+
+      it('does not render', () => {
+        expect(findResetLinkButton().exists()).toBe(false);
+      });
+    });
+
+    describe('with filter selected', () => {
+      beforeEach(() => {
+        createComponent({ urlQuery: MOCK_QUERY });
+      });
+
+      it('does render', () => {
+        expect(findResetLinkButton().exists()).toBe(true);
+      });
+    });
+
+    describe('with filter selected and user updated query back to default', () => {
+      beforeEach(() => {
+        createComponent({ urlQuery: MOCK_QUERY, query: {} });
+      });
+
+      it('does render', () => {
+        expect(findResetLinkButton().exists()).toBe(true);
+      });
+    });
+  });
+
+  describe('actions', () => {
+    beforeEach(() => {
+      createComponent({});
+    });
+
+    it('clicking ApplyButton calls applyQuery', () => {
+      findSidebarForm().trigger('submit');
+
+      expect(actionSpies.applyQuery).toHaveBeenCalled();
+    });
+
+    it('clicking ResetLinkButton calls resetQuery', () => {
+      findResetLinkButton().vm.$emit('click');
+
+      expect(actionSpies.resetQuery).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/spec/frontend/search/sidebar/components/scope_navigation_spec.js b/spec/frontend/search/sidebar/components/scope_navigation_spec.js
new file mode 100644
index 00000000000..6262a52e01a
--- /dev/null
+++ b/spec/frontend/search/sidebar/components/scope_navigation_spec.js
@@ -0,0 +1,80 @@
+import { GlNav, GlNavItem } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import Vue from 'vue';
+import Vuex from 'vuex';
+import { MOCK_QUERY, MOCK_NAVIGATION } from 'jest/search/mock_data';
+import ScopeNavigation from '~/search/sidebar/components/scope_navigation.vue';
+
+Vue.use(Vuex);
+
+describe('ScopeNavigation', () => {
+  let wrapper;
+
+  const actionSpies = {
+    fetchSidebarCount: jest.fn(),
+  };
+
+  const createComponent = (initialState) => {
+    const store = new Vuex.Store({
+      state: {
+        urlQuery: MOCK_QUERY,
+        navigation: MOCK_NAVIGATION,
+        ...initialState,
+      },
+      actions: actionSpies,
+    });
+
+    wrapper = shallowMount(ScopeNavigation, {
+      store,
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  const findNavElement = () => wrapper.find('nav');
+  const findGlNav = () => wrapper.findComponent(GlNav);
+  const findGlNavItems = () => wrapper.findAllComponents(GlNavItem);
+  const findGlNavItemActive = () => findGlNavItems().wrappers.filter((w) => w.attributes('active'));
+  const findGlNavItemActiveCount = () => findGlNavItemActive().at(0).findAll('span').at(1);
+
+  describe('scope navigation', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('renders section', () => {
+      expect(findNavElement().exists()).toBe(true);
+    });
+
+    it('renders nav component', () => {
+      expect(findGlNav().exists()).toBe(true);
+    });
+
+    it('renders all nav item components', () => {
+      expect(findGlNavItems()).toHaveLength(9);
+    });
+
+    it('nav items have proper links', () => {
+      const linkAtPosition = 3;
+      const { link } = MOCK_NAVIGATION[Object.keys(MOCK_NAVIGATION)[linkAtPosition]];
+
+      expect(findGlNavItems().at(linkAtPosition).attributes('href')).toBe(link);
+    });
+  });
+
+  describe('scope navigation sets proper state', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('sets proper class to active item', () => {
+      expect(findGlNavItemActive()).toHaveLength(1);
+    });
+
+    it('active item', () => {
+      expect(findGlNavItemActiveCount().text()).toBe('2.4K');
+    });
+  });
+});