Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 56 deletions

diff --git a/spec/frontend/search/sidebar/components/app_spec.js b/spec/frontend/search/sidebar/components/app_spec.js
index e87217950cd..6aa40b7a2be 100644
--- a/spec/frontend/search/sidebar/components/app_spec.js
+++ b/spec/frontend/search/sidebar/components/app_spec.js
@@ -84,23 +84,14 @@ describe('GlobalSearchSidebar', () => {
         expect(findFilters().exists()).toBe(true);
       });
     });
-  });
-
-  describe('when search_page_vertical_nav is enabled', () => {
-    beforeEach(() => {
-      createComponent({}, { searchPageVerticalNav: true });
-    });
-    it('shows the vertical navigation', () => {
-      expect(findSidebarNavigation().exists()).toBe(true);
-    });
-  });
 
-  describe('when search_page_vertical_nav is disabled', () => {
-    beforeEach(() => {
-      createComponent({}, { searchPageVerticalNav: false });
-    });
-    it('hides the vertical navigation', () => {
-      expect(findSidebarNavigation().exists()).toBe(false);
+    describe('renders navigation', () => {
+      beforeEach(() => {
+        createComponent({});
+      });
+      it('shows the vertical navigation', () => {
+        expect(findSidebarNavigation().exists()).toBe(true);
+      });
     });
   });
 });
diff --git a/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js b/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js
index d5ecca4636c..4f146757454 100644
--- a/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js
+++ b/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js
@@ -22,24 +22,4 @@ describe('ConfidentialityFilter', () => {
       expect(findRadioFilter().exists()).toBe(true);
     });
   });
-
-  describe.each`
-    hasFeatureFlagEnabled | paddingClass
-    ${true}               | ${'gl-px-5'}
-    ${false}              | ${'gl-px-0'}
-  `(`RadioFilter`, ({ hasFeatureFlagEnabled, paddingClass }) => {
-    beforeEach(() => {
-      createComponent({
-        provide: {
-          glFeatures: {
-            searchPageVerticalNav: hasFeatureFlagEnabled,
-          },
-        },
-      });
-    });
-
-    it(`has ${paddingClass} class`, () => {
-      expect(findRadioFilter().classes(paddingClass)).toBe(true);
-    });
-  });
 });
diff --git a/spec/frontend/search/sidebar/components/status_filter_spec.js b/spec/frontend/search/sidebar/components/status_filter_spec.js
index 2ed199469e6..6704634ef36 100644
--- a/spec/frontend/search/sidebar/components/status_filter_spec.js
+++ b/spec/frontend/search/sidebar/components/status_filter_spec.js
@@ -22,24 +22,4 @@ describe('StatusFilter', () => {
       expect(findRadioFilter().exists()).toBe(true);
     });
   });
-
-  describe.each`
-    hasFeatureFlagEnabled | paddingClass
-    ${true}               | ${'gl-px-5'}
-    ${false}              | ${'gl-px-0'}
-  `(`RadioFilter`, ({ hasFeatureFlagEnabled, paddingClass }) => {
-    beforeEach(() => {
-      createComponent({
-        provide: {
-          glFeatures: {
-            searchPageVerticalNav: hasFeatureFlagEnabled,
-          },
-        },
-      });
-    });
-
-    it(`has ${paddingClass} class`, () => {
-      expect(findRadioFilter().classes(paddingClass)).toBe(true);
-    });
-  });
 });