Commit cb3cb229 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '219870-label-select-dropdown-title' into 'master'

Update label select vue gl button

Closes #219870

See merge request gitlab-org/gitlab!37986
parents 5ac09048 b72362d6
<script> <script>
import { mapState, mapActions } from 'vuex'; import { mapState, mapActions } from 'vuex';
import { GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui'; import { GlButton, GlLoadingIcon } from '@gitlab/ui';
export default { export default {
components: { components: {
GlDeprecatedButton, GlButton,
GlLoadingIcon, GlLoadingIcon,
}, },
props: { props: {
...@@ -27,12 +27,12 @@ export default { ...@@ -27,12 +27,12 @@ export default {
{{ __('Labels') }} {{ __('Labels') }}
<template v-if="allowLabelEdit"> <template v-if="allowLabelEdit">
<gl-loading-icon v-show="labelsSelectInProgress" inline /> <gl-loading-icon v-show="labelsSelectInProgress" inline />
<gl-deprecated-button <gl-button
variant="link" variant="link"
class="pull-right js-sidebar-dropdown-toggle" class="pull-right js-sidebar-dropdown-toggle"
data-qa-selector="labels_edit_button" data-qa-selector="labels_edit_button"
@click="toggleDropdownContents" @click="toggleDropdownContents"
>{{ __('Edit') }}</gl-deprecated-button >{{ __('Edit') }}</gl-button
> >
</template> </template>
</div> </div>
......
---
title: Update label select vue gl button
merge_request: 37986
author:
type: changed
import Vuex from 'vuex'; import Vuex from 'vuex';
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount, createLocalVue } from '@vue/test-utils';
import { GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui'; import { GlButton, GlLoadingIcon } from '@gitlab/ui';
import DropdownTitle from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue'; import DropdownTitle from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue';
import labelsSelectModule from '~/vue_shared/components/sidebar/labels_select_vue/store'; import labelsSelectModule from '~/vue_shared/components/sidebar/labels_select_vue/store';
...@@ -42,7 +42,7 @@ describe('DropdownTitle', () => { ...@@ -42,7 +42,7 @@ describe('DropdownTitle', () => {
}); });
it('renders edit link', () => { it('renders edit link', () => {
const editBtnEl = wrapper.find(GlDeprecatedButton); const editBtnEl = wrapper.find(GlButton);
expect(editBtnEl.exists()).toBe(true); expect(editBtnEl.exists()).toBe(true);
expect(editBtnEl.text()).toBe('Edit'); expect(editBtnEl.text()).toBe('Edit');
......
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