Commit 69ed863a authored by Russell Dickenson's avatar Russell Dickenson Committed by Simon Knox

Replace GlDeprecatedButton with GlButton in approvers_list_item.vue

parent bdbb6a8b
<script> <script>
import { GlDeprecatedButton, GlIcon } from '@gitlab/ui'; import { GlButton, GlTooltipDirective } from '@gitlab/ui';
import Avatar from '~/vue_shared/components/project_avatar/default.vue'; import Avatar from '~/vue_shared/components/project_avatar/default.vue';
import HiddenGroupsItem from './hidden_groups_item.vue'; import HiddenGroupsItem from './hidden_groups_item.vue';
import { TYPE_USER, TYPE_GROUP, TYPE_HIDDEN_GROUPS } from '../constants'; import { TYPE_USER, TYPE_GROUP, TYPE_HIDDEN_GROUPS } from '../constants';
...@@ -8,11 +8,13 @@ const types = [TYPE_USER, TYPE_GROUP, TYPE_HIDDEN_GROUPS]; ...@@ -8,11 +8,13 @@ const types = [TYPE_USER, TYPE_GROUP, TYPE_HIDDEN_GROUPS];
export default { export default {
components: { components: {
GlDeprecatedButton, GlButton,
GlIcon,
Avatar, Avatar,
HiddenGroupsItem, HiddenGroupsItem,
}, },
directives: {
GlTooltip: GlTooltipDirective,
},
props: { props: {
approver: { approver: {
type: Object, type: Object,
...@@ -41,9 +43,14 @@ export default { ...@@ -41,9 +43,14 @@ export default {
<template v-else> <template v-else>
<avatar :project="approver" :size="24" /><span>{{ displayName }}</span> <avatar :project="approver" :size="24" /><span>{{ displayName }}</span>
</template> </template>
<gl-deprecated-button variant="none" class="ml-auto" @click="$emit('remove', approver)"> <gl-button
<gl-icon name="remove" :aria-label="__('Remove')" /> v-gl-tooltip
</gl-deprecated-button> class="ml-auto"
icon="remove"
:aria-label="__('Remove')"
:title="__('Remove')"
@click="$emit('remove', approver)"
/>
</li> </li>
</transition> </transition>
</template> </template>
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { GlDeprecatedButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import { TYPE_USER, TYPE_GROUP, TYPE_HIDDEN_GROUPS } from 'ee/approvals/constants'; import { TYPE_USER, TYPE_GROUP, TYPE_HIDDEN_GROUPS } from 'ee/approvals/constants';
import ApproversListItem from 'ee/approvals/components/approvers_list_item.vue'; import ApproversListItem from 'ee/approvals/components/approvers_list_item.vue';
import HiddenGroupsItem from 'ee/approvals/components/hidden_groups_item.vue'; import HiddenGroupsItem from 'ee/approvals/components/hidden_groups_item.vue';
...@@ -47,7 +47,7 @@ describe('Approvals ApproversListItem', () => { ...@@ -47,7 +47,7 @@ describe('Approvals ApproversListItem', () => {
}); });
it('when remove clicked, emits remove', () => { it('when remove clicked, emits remove', () => {
const button = wrapper.find(GlDeprecatedButton); const button = wrapper.find(GlButton);
button.vm.$emit('click'); button.vm.$emit('click');
return wrapper.vm.$nextTick().then(() => { return wrapper.vm.$nextTick().then(() => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment