1 files changed, 5 insertions, 66 deletions

diff --git a/spec/frontend/search/sidebar/components/issues_filters_spec.js b/spec/frontend/search/sidebar/components/issues_filters_spec.js
index 860c5c147a6..ce9c6c2bb0c 100644
--- a/spec/frontend/search/sidebar/components/issues_filters_spec.js
+++ b/spec/frontend/search/sidebar/components/issues_filters_spec.js
@@ -19,11 +19,10 @@ describe('GlobalSearch IssuesFilters', () => {
     currentScope: () => 'issues',
   };
 
-  const createComponent = ({ initialState = {}, searchIssueLabelAggregation = true } = {}) => {
+  const createComponent = ({ initialState = {} } = {}) => {
     const store = new Vuex.Store({
       state: {
         urlQuery: MOCK_QUERY,
-        useSidebarNavigation: false,
         searchType: SEARCH_TYPE_ADVANCED,
         ...initialState,
       },
@@ -32,11 +31,6 @@ describe('GlobalSearch IssuesFilters', () => {
 
     wrapper = shallowMount(IssuesFilters, {
       store,
-      provide: {
-        glFeatures: {
-          searchIssueLabelAggregation,
-        },
-      },
     });
   };
 
@@ -44,17 +38,10 @@ describe('GlobalSearch IssuesFilters', () => {
   const findConfidentialityFilter = () => wrapper.findComponent(ConfidentialityFilter);
   const findLabelFilter = () => wrapper.findComponent(LabelFilter);
   const findArchivedFilter = () => wrapper.findComponent(ArchivedFilter);
-  const findDividers = () => wrapper.findAll('hr');
 
-  describe.each`
-    description                                       | searchIssueLabelAggregation
-    ${'Renders correctly with Label Filter disabled'} | ${false}
-    ${'Renders correctly with Label Filter enabled'}  | ${true}
-  `('$description', ({ searchIssueLabelAggregation }) => {
+  describe('Renders filters correctly with advanced search', () => {
     beforeEach(() => {
-      createComponent({
-        searchIssueLabelAggregation,
-      });
+      createComponent();
     });
 
     it('renders StatusFilter', () => {
@@ -69,17 +56,8 @@ describe('GlobalSearch IssuesFilters', () => {
       expect(findArchivedFilter().exists()).toBe(true);
     });
 
-    it(`renders correctly LabelFilter when searchIssueLabelAggregation is ${searchIssueLabelAggregation}`, () => {
-      expect(findLabelFilter().exists()).toBe(searchIssueLabelAggregation);
-    });
-
-    it('renders divider correctly', () => {
-      // two dividers can't be disabled
-      let dividersCount = 2;
-      if (searchIssueLabelAggregation) {
-        dividersCount += 1;
-      }
-      expect(findDividers()).toHaveLength(dividersCount);
+    it('renders correctly LabelFilter', () => {
+      expect(findLabelFilter().exists()).toBe(true);
     });
   });
 
@@ -102,41 +80,6 @@ describe('GlobalSearch IssuesFilters', () => {
     it("doesn't render ArchivedFilter", () => {
       expect(findArchivedFilter().exists()).toBe(true);
     });
-
-    it('renders 1 divider', () => {
-      expect(findDividers()).toHaveLength(2);
-    });
-  });
-
-  describe('Renders correctly in new nav', () => {
-    beforeEach(() => {
-      createComponent({
-        initialState: {
-          searchType: SEARCH_TYPE_ADVANCED,
-          useSidebarNavigation: true,
-        },
-        searchIssueLabelAggregation: true,
-      });
-    });
-    it('renders StatusFilter', () => {
-      expect(findStatusFilter().exists()).toBe(true);
-    });
-
-    it('renders ConfidentialityFilter', () => {
-      expect(findConfidentialityFilter().exists()).toBe(true);
-    });
-
-    it('renders LabelFilter', () => {
-      expect(findLabelFilter().exists()).toBe(true);
-    });
-
-    it('renders ArchivedFilter', () => {
-      expect(findArchivedFilter().exists()).toBe(true);
-    });
-
-    it("doesn't render dividers", () => {
-      expect(findDividers()).toHaveLength(0);
-    });
   });
 
   describe('Renders correctly with wrong scope', () => {
@@ -159,9 +102,5 @@ describe('GlobalSearch IssuesFilters', () => {
     it("doesn't render ArchivedFilter", () => {
       expect(findArchivedFilter().exists()).toBe(false);
     });
-
-    it("doesn't render dividers", () => {
-      expect(findDividers()).toHaveLength(0);
-    });
   });
 });