Commit 8ebc6cfd authored by Simon Knox's avatar Simon Knox

Merge branch 'selhorn-user_avatar_list' into 'master'

Replace deprecated-button - user avatar list

Closes #219815

See merge request gitlab-org/gitlab!39515
parents ad610d65 e2d24850
<script>
import { GlDeprecatedButton } from '@gitlab/ui';
import { GlButton } from '@gitlab/ui';
import { sprintf, __ } from '~/locale';
import UserAvatarLink from './user_avatar_link.vue';
export default {
components: {
UserAvatarLink,
GlDeprecatedButton,
GlButton,
},
props: {
items: {
......@@ -82,12 +82,12 @@ export default {
:img-size="imgSize"
/>
<template v-if="hasBreakpoint">
<gl-deprecated-button v-if="hasHiddenItems" variant="link" @click="expand">
<gl-button v-if="hasHiddenItems" variant="link" @click="expand">
{{ expandText }}
</gl-deprecated-button>
<gl-deprecated-button v-else variant="link" @click="collapse">
</gl-button>
<gl-button v-else variant="link" @click="collapse">
{{ __('show less') }}
</gl-deprecated-button>
</gl-button>
</template>
</div>
</template>
import { shallowMount } from '@vue/test-utils';
import { GlDeprecatedButton } from '@gitlab/ui';
import { GlButton } from '@gitlab/ui';
import { TEST_HOST } from 'spec/test_constants';
import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
......@@ -37,7 +37,7 @@ describe('UserAvatarList', () => {
};
const clickButton = () => {
const button = wrapper.find(GlDeprecatedButton);
const button = wrapper.find(GlButton);
button.vm.$emit('click');
};
......@@ -112,7 +112,7 @@ describe('UserAvatarList', () => {
it('does not show button', () => {
factory();
expect(wrapper.find(GlDeprecatedButton).exists()).toBe(false);
expect(wrapper.find(GlButton).exists()).toBe(false);
});
});
......
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