Commit 2e1fa146 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch...

Merge branch '219781-replace-gl-deprecated-button-with-gl-button-in-ee-app-assets-javascripts-subscriptions-new' into 'master'

Replace <gl-deprecated-button> with <gl-button> in subscriptions/new/components/checkout/confirm_order.vue

See merge request gitlab-org/gitlab!40119
parents e0aa1d11 b6cf6a5e
<script> <script>
import { mapState, mapActions, mapGetters } from 'vuex'; import { mapState, mapActions, mapGetters } from 'vuex';
import { GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui'; import { GlButton, GlLoadingIcon } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
export default { export default {
components: { components: {
GlDeprecatedButton, GlButton,
GlLoadingIcon, GlLoadingIcon,
}, },
computed: { computed: {
...@@ -26,9 +26,14 @@ export default { ...@@ -26,9 +26,14 @@ export default {
</script> </script>
<template> <template>
<div v-if="isActive" class="full-width gl-mb-7"> <div v-if="isActive" class="full-width gl-mb-7">
<gl-deprecated-button :disabled="isConfirmingOrder" variant="success" @click="confirmOrder"> <gl-button
:disabled="isConfirmingOrder"
variant="success"
category="primary"
@click="confirmOrder"
>
<gl-loading-icon v-if="isConfirmingOrder" inline size="sm" /> <gl-loading-icon v-if="isConfirmingOrder" inline size="sm" />
{{ isConfirmingOrder ? $options.i18n.confirming : $options.i18n.confirm }} {{ isConfirmingOrder ? $options.i18n.confirming : $options.i18n.confirm }}
</gl-deprecated-button> </gl-button>
</div> </div>
</template> </template>
---
title: Replace <gl-deprecated-button> with <gl-button> in confirm_order component
merge_request: 40119
author:
type: changed
...@@ -3,7 +3,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; ...@@ -3,7 +3,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
import Api from 'ee/api'; import Api from 'ee/api';
import createStore from 'ee/subscriptions/new/store'; import createStore from 'ee/subscriptions/new/store';
import * as types from 'ee/subscriptions/new/store/mutation_types'; import * as types from 'ee/subscriptions/new/store/mutation_types';
import { GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui'; import { GlButton, GlLoadingIcon } from '@gitlab/ui';
import Component from 'ee/subscriptions/new/components/checkout/confirm_order.vue'; import Component from 'ee/subscriptions/new/components/checkout/confirm_order.vue';
describe('Confirm Order', () => { describe('Confirm Order', () => {
...@@ -24,7 +24,7 @@ describe('Confirm Order', () => { ...@@ -24,7 +24,7 @@ describe('Confirm Order', () => {
}); });
}; };
const findConfirmButton = () => wrapper.find(GlDeprecatedButton); const findConfirmButton = () => wrapper.find(GlButton);
const findLoadingIcon = () => wrapper.find(GlLoadingIcon); const findLoadingIcon = () => wrapper.find(GlLoadingIcon);
beforeEach(() => { beforeEach(() => {
......
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