Commit c94a823d authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'Swap-metric-settings-button' into 'master'

Swap deprecated button in settings > operations

See merge request gitlab-org/gitlab!39131
parents 25e4f393 18ca7848
<script>
import { mapState, mapActions } from 'vuex';
import { GlDeprecatedButton as GlButton, GlLink } from '@gitlab/ui';
import { GlButton, GlLink } from '@gitlab/ui';
import ExternalDashboard from './form_group/external_dashboard.vue';
import DashboardTimezone from './form_group/dashboard_timezone.vue';
......@@ -45,7 +45,7 @@ export default {
<dashboard-timezone />
<external-dashboard />
<div class="gl-display-flex gl-justify-content-end">
<gl-button variant="success" @click="saveChanges">
<gl-button variant="success" category="primary" @click="saveChanges">
{{ __('Save Changes') }}
</gl-button>
</div>
......
import { mount, shallowMount } from '@vue/test-utils';
import { GlDeprecatedButton, GlLink, GlFormGroup, GlFormInput, GlFormSelect } from '@gitlab/ui';
import { GlButton, GlLink, GlFormGroup, GlFormInput, GlFormSelect } from '@gitlab/ui';
import { TEST_HOST } from 'helpers/test_constants';
import MetricsSettings from '~/operation_settings/components/metrics_settings.vue';
......@@ -61,7 +61,7 @@ describe('operation settings external dashboard component', () => {
describe('expand/collapse button', () => {
it('renders as an expand button by default', () => {
const button = wrapper.find(GlDeprecatedButton);
const button = wrapper.find(GlButton);
expect(button.text()).toBe('Expand');
});
......@@ -160,8 +160,7 @@ describe('operation settings external dashboard component', () => {
});
describe('submit button', () => {
const findSubmitButton = () =>
wrapper.find('.settings-content form').find(GlDeprecatedButton);
const findSubmitButton = () => wrapper.find('.settings-content form').find(GlButton);
const endpointRequest = [
operationsSettingsEndpoint,
......
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