Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

3 files changed, 1 insertions, 27 deletions

diff --git a/spec/frontend/admin/signup_restrictions/components/signup_checkbox_spec.js b/spec/frontend/admin/signup_restrictions/components/signup_checkbox_spec.js
index eecc21e206b..9e55716cc30 100644
--- a/spec/frontend/admin/signup_restrictions/components/signup_checkbox_spec.js
+++ b/spec/frontend/admin/signup_restrictions/components/signup_checkbox_spec.js
@@ -28,10 +28,6 @@ describe('Signup Form', () => {
   const findCheckboxLabel = () => findByTestId('label');
   const findHelpText = () => findByTestId('helpText');
 
-  afterEach(() => {
-    wrapper.destroy();
-  });
-
   describe('Signup Checkbox', () => {
     beforeEach(() => {
       mountComponent();
diff --git a/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js b/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js
index f2a951bcc76..db8c33d01cb 100644
--- a/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js
+++ b/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js
@@ -1,4 +1,4 @@
-import { GlButton, GlModal, GlLink } from '@gitlab/ui';
+import { GlButton, GlModal } from '@gitlab/ui';
 import { within } from '@testing-library/dom';
 import { shallowMount, mount, createWrapper } from '@vue/test-utils';
 import { stubComponent } from 'helpers/stub_component';
@@ -36,12 +36,9 @@ describe('Signup Form', () => {
   const findDenyListRawInputGroup = () => wrapper.findByTestId('domain-denylist-raw-input-group');
   const findDenyListFileInputGroup = () => wrapper.findByTestId('domain-denylist-file-input-group');
   const findUserCapInput = () => wrapper.findByTestId('user-cap-input');
-  const findUserCapFormGroup = () => wrapper.findByTestId('user-cap-form-group');
   const findModal = () => wrapper.findComponent(GlModal);
 
   afterEach(() => {
-    wrapper.destroy();
-
     formSubmitSpy = null;
   });
 
@@ -214,19 +211,4 @@ describe('Signup Form', () => {
       });
     });
   });
-
-  describe('rendering help links within user cap description', () => {
-    beforeEach(() => {
-      mountComponent({ mountFn: mount });
-    });
-
-    it('renders projectSharingHelpLink and groupSharingHelpLink', () => {
-      const [projectSharingLink, groupSharingLink] = findUserCapFormGroup().findAllComponents(
-        GlLink,
-      ).wrappers;
-
-      expect(projectSharingLink.attributes('href')).toBe(mockData.projectSharingHelpLink);
-      expect(groupSharingLink.attributes('href')).toBe(mockData.groupSharingHelpLink);
-    });
-  });
 });
diff --git a/spec/frontend/admin/signup_restrictions/mock_data.js b/spec/frontend/admin/signup_restrictions/mock_data.js
index ce5ec2248fe..3140d7be105 100644
--- a/spec/frontend/admin/signup_restrictions/mock_data.js
+++ b/spec/frontend/admin/signup_restrictions/mock_data.js
@@ -22,8 +22,6 @@ export const rawMockData = {
   passwordLowercaseRequired: 'true',
   passwordUppercaseRequired: 'true',
   passwordSymbolRequired: 'true',
-  projectSharingHelpLink: 'project-sharing/help/link',
-  groupSharingHelpLink: 'group-sharing/help/link',
 };
 
 export const mockData = {
@@ -50,6 +48,4 @@ export const mockData = {
   passwordLowercaseRequired: true,
   passwordUppercaseRequired: true,
   passwordSymbolRequired: true,
-  projectSharingHelpLink: 'project-sharing/help/link',
-  groupSharingHelpLink: 'group-sharing/help/link',
 };