Add latest changes from gitlab-org/gitlab@master

10 files changed, 0 insertions, 59 deletions

diff --git a/spec/frontend/feature_flags/components/edit_feature_flag_spec.js b/spec/frontend/feature_flags/components/edit_feature_flag_spec.js
index c26fd80865d..b8d058e7bc5 100644
--- a/spec/frontend/feature_flags/components/edit_feature_flag_spec.js
+++ b/spec/frontend/feature_flags/components/edit_feature_flag_spec.js
@@ -24,10 +24,6 @@ describe('Edit feature flag form', () => {
   });
 
   const factory = (provide = { searchPath: '/search' }) => {
-    if (wrapper) {
-      wrapper.destroy();
-      wrapper = null;
-    }
     wrapper = shallowMount(EditFeatureFlag, {
       store,
       provide,
diff --git a/spec/frontend/feature_flags/components/empty_state_spec.js b/spec/frontend/feature_flags/components/empty_state_spec.js
index d983332f7c1..4aa0b261e2a 100644
--- a/spec/frontend/feature_flags/components/empty_state_spec.js
+++ b/spec/frontend/feature_flags/components/empty_state_spec.js
@@ -44,12 +44,6 @@ describe('feature_flags/components/feature_flags_tab.vue', () => {
       },
     );
 
-  afterEach(() => {
-    if (wrapper?.destroy) {
-      wrapper.destroy();
-    }
-  });
-
   describe('alerts', () => {
     let alerts;
 
diff --git a/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js b/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js
index 14e1f34bc59..6156addd63f 100644
--- a/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js
+++ b/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js
@@ -22,10 +22,6 @@ describe('New Environments Dropdown', () => {
 
   afterEach(() => {
     axiosMock.restore();
-    if (wrapper) {
-      wrapper.destroy();
-      wrapper = null;
-    }
   });
 
   describe('before results', () => {
diff --git a/spec/frontend/feature_flags/components/new_feature_flag_spec.js b/spec/frontend/feature_flags/components/new_feature_flag_spec.js
index 46c9118cbd9..c5418477661 100644
--- a/spec/frontend/feature_flags/components/new_feature_flag_spec.js
+++ b/spec/frontend/feature_flags/components/new_feature_flag_spec.js
@@ -22,10 +22,6 @@ describe('New feature flag form', () => {
   });
 
   const factory = (opts = {}) => {
-    if (wrapper) {
-      wrapper.destroy();
-      wrapper = null;
-    }
     wrapper = shallowMount(NewFeatureFlag, {
       store,
       provide: {
diff --git a/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js b/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js
index 5feaf094701..a6eb81ef6f0 100644
--- a/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js
+++ b/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js
@@ -20,12 +20,6 @@ describe('feature_flags/components/strategies/flexible_rollout.vue', () => {
   const factory = (props = {}) =>
     mount(FlexibleRollout, { propsData: { ...DEFAULT_PROPS, ...props } });
 
-  afterEach(() => {
-    if (wrapper?.destroy) {
-      wrapper.destroy();
-    }
-  });
-
   describe('with valid percentage', () => {
     beforeEach(() => {
       wrapper = factory();
diff --git a/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js b/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js
index 365f1e534b5..8ad70466e90 100644
--- a/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js
+++ b/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js
@@ -24,12 +24,6 @@ describe('~/feature_flags/strategies/parameter_form_group.vue', () => {
     slot = wrapper.find('[data-testid="slot"]');
   });
 
-  afterEach(() => {
-    if (wrapper?.destroy) {
-      wrapper.destroy();
-    }
-  });
-
   it('should display the default slot', () => {
     expect(slot.exists()).toBe(true);
   });
diff --git a/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js b/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js
index b20061c12a2..e00869fdd09 100644
--- a/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js
+++ b/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js
@@ -18,12 +18,6 @@ describe('~/feature_flags/components/strategies/percent_rollout.vue', () => {
   const factory = (props = {}) =>
     mount(PercentRollout, { propsData: { ...DEFAULT_PROPS, ...props } });
 
-  afterEach(() => {
-    if (wrapper?.destroy) {
-      wrapper.destroy();
-    }
-  });
-
   describe('with valid percentage', () => {
     beforeEach(() => {
       wrapper = factory();
diff --git a/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js b/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js
index ae489f3a6e6..f3b8535a650 100644
--- a/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js
+++ b/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js
@@ -18,12 +18,6 @@ describe('~/feature_flags/components/users_with_id.vue', () => {
     textarea = wrapper.findComponent(GlFormTextarea);
   });
 
-  afterEach(() => {
-    if (wrapper?.destroy) {
-      wrapper.destroy();
-    }
-  });
-
   it('should display the current value of the parameters', () => {
     expect(textarea.element.value).toBe(usersWithIdStrategy.parameters.userIds);
   });
diff --git a/spec/frontend/feature_flags/components/strategy_parameters_spec.js b/spec/frontend/feature_flags/components/strategy_parameters_spec.js
index cd8270f1801..bc34888d1c1 100644
--- a/spec/frontend/feature_flags/components/strategy_parameters_spec.js
+++ b/spec/frontend/feature_flags/components/strategy_parameters_spec.js
@@ -28,12 +28,6 @@ describe('~/feature_flags/components/strategy_parameters.vue', () => {
       },
     });
 
-  afterEach(() => {
-    if (wrapper?.destroy) {
-      wrapper.destroy();
-    }
-  });
-
   describe.each`
     name                                 | component
     ${ROLLOUT_STRATEGY_ALL_USERS}        | ${Default}
diff --git a/spec/frontend/feature_flags/components/strategy_spec.js b/spec/frontend/feature_flags/components/strategy_spec.js
index 84d4180fe63..1428d99aa76 100644
--- a/spec/frontend/feature_flags/components/strategy_spec.js
+++ b/spec/frontend/feature_flags/components/strategy_spec.js
@@ -44,10 +44,6 @@ describe('Feature flags strategy', () => {
       provide,
     },
   ) => {
-    if (wrapper) {
-      wrapper.destroy();
-      wrapper = null;
-    }
     wrapper = mount(Strategy, { store: createStore({ projectId: '1' }), ...opts });
   };
 
@@ -55,13 +51,6 @@ describe('Feature flags strategy', () => {
     Api.searchFeatureFlagUserLists.mockResolvedValue({ data: [userList] });
   });
 
-  afterEach(() => {
-    if (wrapper) {
-      wrapper.destroy();
-      wrapper = null;
-    }
-  });
-
   describe('helper links', () => {
     const propsData = { strategy: {}, index: 0, userLists: [userList] };
     factory({ propsData, provide });