Commit c7f7cdab authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'matej-replace-resolve-with-issue-button' into 'master'

Replace the "Resolve discussion with a new issue" GlDeprecatedButton

Closes #219812

See merge request gitlab-org/gitlab!38665
parents bba53b69 8c9b1995
<script> <script>
import { GlTooltipDirective, GlDeprecatedButton } from '@gitlab/ui'; import { GlTooltipDirective, GlButton } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue';
export default { export default {
name: 'ResolveWithIssueButton', name: 'ResolveWithIssueButton',
components: { components: {
Icon, GlButton,
GlDeprecatedButton,
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
...@@ -22,13 +20,12 @@ export default { ...@@ -22,13 +20,12 @@ export default {
<template> <template>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<gl-deprecated-button <gl-button
v-gl-tooltip v-gl-tooltip
:href="url" :href="url"
:title="s__('MergeRequests|Resolve this thread in a new issue')" :title="s__('MergeRequests|Resolve this thread in a new issue')"
class="new-issue-for-discussion discussion-create-issue-btn" class="new-issue-for-discussion discussion-create-issue-btn"
> icon="issue-new"
<icon name="issue-new" /> />
</gl-deprecated-button>
</div> </div>
</template> </template>
import { GlDeprecatedButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount, createLocalVue } from '@vue/test-utils';
import { TEST_HOST } from 'spec/test_constants'; import { TEST_HOST } from 'spec/test_constants';
import ResolveWithIssueButton from '~/notes/components/discussion_resolve_with_issue_button.vue'; import ResolveWithIssueButton from '~/notes/components/discussion_resolve_with_issue_button.vue';
...@@ -23,7 +23,7 @@ describe('ResolveWithIssueButton', () => { ...@@ -23,7 +23,7 @@ describe('ResolveWithIssueButton', () => {
}); });
it('it should have a link with the provided link property as href', () => { it('it should have a link with the provided link property as href', () => {
const button = wrapper.find(GlDeprecatedButton); const button = wrapper.find(GlButton);
expect(button.attributes().href).toBe(url); expect(button.attributes().href).toBe(url);
}); });
......
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