Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 21 deletions

diff --git a/spec/frontend/search/sidebar/components/issues_filters_spec.js b/spec/frontend/search/sidebar/components/issues_filters_spec.js
index acdfa41b5f8..ce9c6c2bb0c 100644
--- a/spec/frontend/search/sidebar/components/issues_filters_spec.js
+++ b/spec/frontend/search/sidebar/components/issues_filters_spec.js
@@ -19,7 +19,7 @@ describe('GlobalSearch IssuesFilters', () => {
     currentScope: () => 'issues',
   };
 
-  const createComponent = ({ initialState = {}, searchIssueLabelAggregation = true } = {}) => {
+  const createComponent = ({ initialState = {} } = {}) => {
     const store = new Vuex.Store({
       state: {
         urlQuery: MOCK_QUERY,
@@ -31,11 +31,6 @@ describe('GlobalSearch IssuesFilters', () => {
 
     wrapper = shallowMount(IssuesFilters, {
       store,
-      provide: {
-        glFeatures: {
-          searchIssueLabelAggregation,
-        },
-      },
     });
   };
 
@@ -44,15 +39,9 @@ describe('GlobalSearch IssuesFilters', () => {
   const findLabelFilter = () => wrapper.findComponent(LabelFilter);
   const findArchivedFilter = () => wrapper.findComponent(ArchivedFilter);
 
-  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', () => {
@@ -67,8 +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 correctly LabelFilter', () => {
+      expect(findLabelFilter().exists()).toBe(true);
     });
   });
 
diff --git a/spec/frontend/search/sidebar/components/label_filter_spec.js b/spec/frontend/search/sidebar/components/label_filter_spec.js
index 9d2a0c5e739..7641036b9f6 100644
--- a/spec/frontend/search/sidebar/components/label_filter_spec.js
+++ b/spec/frontend/search/sidebar/components/label_filter_spec.js
@@ -85,11 +85,6 @@ describe('GlobalSearchSidebarLabelFilter', () => {
 
     wrapper = mountExtended(LabelFilter, {
       store,
-      provide: {
-        glFeatures: {
-          searchIssueLabelAggregation: true,
-        },
-      },
     });
   };