Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 16 deletions

diff --git a/spec/frontend/admin/users/components/actions/actions_spec.js b/spec/frontend/admin/users/components/actions/actions_spec.js
index 4aeaa5356b4..a5e7c6ebe21 100644
--- a/spec/frontend/admin/users/components/actions/actions_spec.js
+++ b/spec/frontend/admin/users/components/actions/actions_spec.js
@@ -1,4 +1,4 @@
-import { GlDropdownItem } from '@gitlab/ui';
+import { GlDisclosureDropdownItem } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import Actions from '~/admin/users/components/actions';
 import Delete from '~/admin/users/components/actions/delete.vue';
@@ -12,7 +12,7 @@ import { paths, userDeletionObstacles } from '../../mock_data';
 describe('Action components', () => {
   let wrapper;
 
-  const findDropdownItem = () => wrapper.findComponent(GlDropdownItem);
+  const findDisclosureDropdownItem = () => wrapper.findComponent(GlDisclosureDropdownItem);
 
   const initComponent = ({ component, props } = {}) => {
     wrapper = shallowMount(component, {
@@ -32,7 +32,7 @@ describe('Action components', () => {
         },
       });
 
-      expect(findDropdownItem().exists()).toBe(true);
+      expect(findDisclosureDropdownItem().exists()).toBe(true);
     });
   });
 
@@ -52,7 +52,7 @@ describe('Action components', () => {
         },
       });
 
-      await findDropdownItem().vm.$emit('click');
+      await findDisclosureDropdownItem().vm.$emit('action');
 
       expect(eventHub.$emit).toHaveBeenCalledWith(
         EVENT_OPEN_DELETE_USER_MODAL,
diff --git a/spec/frontend/admin/users/components/actions/delete_with_contributions_spec.js b/spec/frontend/admin/users/components/actions/delete_with_contributions_spec.js
index 64a88aab2c2..606a5c779fb 100644
--- a/spec/frontend/admin/users/components/actions/delete_with_contributions_spec.js
+++ b/spec/frontend/admin/users/components/actions/delete_with_contributions_spec.js
@@ -1,5 +1,5 @@
 import { GlLoadingIcon } from '@gitlab/ui';
-import { mountExtended } from 'helpers/vue_test_utils_helper';
+import { mount } from '@vue/test-utils';
 import waitForPromises from 'helpers/wait_for_promises';
 import DeleteWithContributions from '~/admin/users/components/actions/delete_with_contributions.vue';
 import eventHub, {
@@ -35,7 +35,7 @@ describe('DeleteWithContributions', () => {
   };
 
   const createComponent = () => {
-    wrapper = mountExtended(DeleteWithContributions, { propsData: defaultPropsData });
+    wrapper = mount(DeleteWithContributions, { propsData: defaultPropsData });
   };
 
   describe('when action is clicked', () => {
@@ -47,10 +47,10 @@ describe('DeleteWithContributions', () => {
       });
 
       it('displays loading icon and disables button', async () => {
-        await wrapper.trigger('click');
+        await wrapper.find('button').trigger('click');
 
         expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
-        expect(wrapper.findByRole('menuitem').attributes()).toMatchObject({
+        expect(wrapper.attributes()).toMatchObject({
           disabled: 'disabled',
           'aria-busy': 'true',
         });
@@ -67,7 +67,7 @@ describe('DeleteWithContributions', () => {
       });
 
       it('emits event with association counts', async () => {
-        await wrapper.trigger('click');
+        await wrapper.find('button').trigger('click');
         await waitForPromises();
 
         expect(associationsCount).toHaveBeenCalledWith(defaultPropsData.userId);
@@ -92,7 +92,7 @@ describe('DeleteWithContributions', () => {
       });
 
       it('emits event with error', async () => {
-        await wrapper.trigger('click');
+        await wrapper.find('button').trigger('click');
         await waitForPromises();
 
         expect(eventHub.$emit).toHaveBeenCalledWith(
diff --git a/spec/frontend/admin/users/components/user_actions_spec.js b/spec/frontend/admin/users/components/user_actions_spec.js
index 1a2cc3e5c34..73d8c082bb9 100644
--- a/spec/frontend/admin/users/components/user_actions_spec.js
+++ b/spec/frontend/admin/users/components/user_actions_spec.js
@@ -1,4 +1,4 @@
-import { GlDropdownDivider } from '@gitlab/ui';
+import { GlDisclosureDropdownGroup } from '@gitlab/ui';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import Actions from '~/admin/users/components/actions';
@@ -19,7 +19,7 @@ describe('AdminUserActions component', () => {
   const findEditButton = (id = user.id) => findUserActions(id).find('[data-testid="edit"]');
   const findActionsDropdown = (id = user.id) =>
     findUserActions(id).find('[data-testid="dropdown-toggle"]');
-  const findDropdownDivider = () => wrapper.findComponent(GlDropdownDivider);
+  const findDisclosureGroup = () => wrapper.findComponent(GlDisclosureDropdownGroup);
 
   const initComponent = ({ actions = [], showButtonLabels } = {}) => {
     wrapper = shallowMountExtended(AdminUserActions, {
@@ -104,8 +104,8 @@ describe('AdminUserActions component', () => {
           initComponent({ actions: [LDAP, ...DELETE_ACTIONS] });
         });
 
-        it('renders a dropdown divider', () => {
-          expect(findDropdownDivider().exists()).toBe(true);
+        it('renders a disclosure group', () => {
+          expect(findDisclosureGroup().exists()).toBe(true);
         });
 
         it('only renders delete dropdown items for actions containing the word "delete"', () => {
@@ -126,8 +126,8 @@ describe('AdminUserActions component', () => {
       });
 
       describe('when there are no delete actions', () => {
-        it('does not render a dropdown divider', () => {
-          expect(findDropdownDivider().exists()).toBe(false);
+        it('does not render a disclosure group', () => {
+          expect(findDisclosureGroup().exists()).toBe(false);
         });
 
         it('does not render a delete dropdown item', () => {