Commit 2e28862e authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '219817-migrate-create-issue-button-in-epic' into 'master'

Migrate deprecated create issue button in epic tree form

Closes #219817

See merge request gitlab-org/gitlab!40647
parents a7e0fc7f 54596f5f
<script> <script>
import { mapState, mapActions } from 'vuex'; import { mapState, mapActions } from 'vuex';
import { import {
GlDeprecatedButton, GlButton,
GlDeprecatedDropdown, GlDeprecatedDropdown,
GlDeprecatedDropdownItem, GlDeprecatedDropdownItem,
GlFormInput, GlFormInput,
...@@ -16,7 +16,7 @@ import { SEARCH_DEBOUNCE } from '../constants'; ...@@ -16,7 +16,7 @@ import { SEARCH_DEBOUNCE } from '../constants';
export default { export default {
components: { components: {
GlDeprecatedButton, GlButton,
GlDeprecatedDropdown, GlDeprecatedDropdown,
GlDeprecatedDropdownItem, GlDeprecatedDropdownItem,
GlFormInput, GlFormInput,
...@@ -171,19 +171,18 @@ export default { ...@@ -171,19 +171,18 @@ export default {
<div class="row my-1"> <div class="row my-1">
<div class="col-sm flex-sm-grow-0 mb-2 mb-sm-0"> <div class="col-sm flex-sm-grow-0 mb-2 mb-sm-0">
<gl-deprecated-button <gl-button
class="w-100" class="w-100"
variant="success" variant="success"
category="primary"
:disabled="!selectedProject || itemCreateInProgress" :disabled="!selectedProject || itemCreateInProgress"
:loading="itemCreateInProgress" :loading="itemCreateInProgress"
@click="createIssue" @click="createIssue"
>{{ __('Create issue') }}</gl-deprecated-button >{{ __('Create issue') }}</gl-button
> >
</div> </div>
<div class="col-sm flex-sm-grow-0 ml-auto"> <div class="col-sm flex-sm-grow-0 ml-auto">
<gl-deprecated-button class="w-100" @click="cancel">{{ <gl-button class="w-100" @click="cancel">{{ __('Cancel') }}</gl-button>
__('Cancel')
}}</gl-deprecated-button>
</div> </div>
</div> </div>
</div> </div>
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount, createLocalVue } from '@vue/test-utils';
import Vuex from 'vuex'; import Vuex from 'vuex';
import { import {
GlDeprecatedButton, GlButton,
GlDeprecatedDropdown, GlDeprecatedDropdown,
GlDeprecatedDropdownItem, GlDeprecatedDropdownItem,
GlFormInput, GlFormInput,
...@@ -233,7 +233,7 @@ describe('CreateIssueForm', () => { ...@@ -233,7 +233,7 @@ describe('CreateIssueForm', () => {
}); });
it('renders `Create issue` button', () => { it('renders `Create issue` button', () => {
const createIssueButton = wrapper.findAll(GlDeprecatedButton).at(0); const createIssueButton = wrapper.findAll(GlButton).at(0);
expect(createIssueButton.exists()).toBe(true); expect(createIssueButton.exists()).toBe(true);
expect(createIssueButton.text()).toBe('Create issue'); expect(createIssueButton.text()).toBe('Create issue');
...@@ -243,7 +243,7 @@ describe('CreateIssueForm', () => { ...@@ -243,7 +243,7 @@ describe('CreateIssueForm', () => {
wrapper.vm.$store.dispatch('requestCreateItem'); wrapper.vm.$store.dispatch('requestCreateItem');
return wrapper.vm.$nextTick(() => { return wrapper.vm.$nextTick(() => {
const createIssueButton = wrapper.findAll(GlDeprecatedButton).at(0); const createIssueButton = wrapper.findAll(GlButton).at(0);
expect(createIssueButton.exists()).toBe(true); expect(createIssueButton.exists()).toBe(true);
expect(createIssueButton.props('disabled')).toBe(true); expect(createIssueButton.props('disabled')).toBe(true);
...@@ -252,7 +252,7 @@ describe('CreateIssueForm', () => { ...@@ -252,7 +252,7 @@ describe('CreateIssueForm', () => {
}); });
it('renders `Cancel` button', () => { it('renders `Cancel` button', () => {
const cancelButton = wrapper.findAll(GlDeprecatedButton).at(1); const cancelButton = wrapper.findAll(GlButton).at(1);
expect(cancelButton.exists()).toBe(true); expect(cancelButton.exists()).toBe(true);
expect(cancelButton.text()).toBe('Cancel'); expect(cancelButton.text()).toBe('Cancel');
......
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