Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

2 files changed, 1 insertions, 27 deletions

diff --git a/spec/frontend/tooltips/components/tooltips_spec.js b/spec/frontend/tooltips/components/tooltips_spec.js
index 3a894427643..e21626456e2 100644
--- a/spec/frontend/tooltips/components/tooltips_spec.js
+++ b/spec/frontend/tooltips/components/tooltips_spec.js
@@ -1,5 +1,5 @@
-import { shallowMount } from '@vue/test-utils';
 import { GlTooltip } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
 import { useMockMutationObserver } from 'helpers/mock_dom_observer';
 import Tooltips from '~/tooltips/components/tooltips.vue';
 
diff --git a/spec/frontend/tooltips/index_spec.js b/spec/frontend/tooltips/index_spec.js
index bff9ee0c7f2..9c03ca8f4c9 100644
--- a/spec/frontend/tooltips/index_spec.js
+++ b/spec/frontend/tooltips/index_spec.js
@@ -1,4 +1,3 @@
-import jQuery from 'jquery';
 import {
   add,
   initTooltips,
@@ -146,29 +145,4 @@ describe('tooltips/index.js', () => {
 
     expect(tooltipsApp.fixTitle).toHaveBeenCalledWith(target);
   });
-
-  describe('when glTooltipsEnabled feature flag is disabled', () => {
-    beforeEach(() => {
-      window.gon.features.glTooltips = false;
-    });
-
-    it.each`
-      method      | methodName    | bootstrapParams
-      ${dispose}  | ${'dispose'}  | ${'dispose'}
-      ${fixTitle} | ${'fixTitle'} | ${'_fixTitle'}
-      ${enable}   | ${'enable'}   | ${'enable'}
-      ${disable}  | ${'disable'}  | ${'disable'}
-      ${hide}     | ${'hide'}     | ${'hide'}
-      ${show}     | ${'show'}     | ${'show'}
-      ${add}      | ${'init'}     | ${{ title: 'the title' }}
-    `('delegates $methodName to bootstrap tooltip API', ({ method, bootstrapParams }) => {
-      const elements = jQuery(createTooltipTarget());
-
-      jest.spyOn(jQuery.fn, 'tooltip');
-
-      method(elements, bootstrapParams);
-
-      expect(elements.tooltip).toHaveBeenCalledWith(bootstrapParams);
-    });
-  });
 });