Commit 43018389 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch...

Merge branch '219753-replace-gl-deprecated-button-with-gl-button-in-app-assets-javascripts' into 'master'

Resolve "Migrate maintenance mode settings button"

Closes #219753

See merge request gitlab-org/gitlab!38901
parents 37c08beb fca529c6
<script> <script>
import { GlToggle, GlFormGroup, GlFormTextarea, GlDeprecatedButton } from '@gitlab/ui'; import { GlToggle, GlFormGroup, GlFormTextarea, GlButton } from '@gitlab/ui';
export default { export default {
name: 'MaintenanceModeSettingsApp', name: 'MaintenanceModeSettingsApp',
...@@ -7,7 +7,7 @@ export default { ...@@ -7,7 +7,7 @@ export default {
GlToggle, GlToggle,
GlFormGroup, GlFormGroup,
GlFormTextarea, GlFormTextarea,
GlDeprecatedButton, GlButton,
}, },
data() { data() {
return { return {
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
/> />
</gl-form-group> </gl-form-group>
<div class="mt-4"> <div class="mt-4">
<gl-deprecated-button variant="success">{{ __('Save changes') }}</gl-deprecated-button> <gl-button variant="success" category="primary">{{ __('Save changes') }}</gl-button>
</div> </div>
</article> </article>
</template> </template>
---
title: Migrate maintenance mode settings button
merge_request: 38901
author:
type: changed
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import MaintenanceModeSettingsApp from '~/maintenance_mode_settings/components/app.vue'; import MaintenanceModeSettingsApp from '~/maintenance_mode_settings/components/app.vue';
import { GlToggle, GlFormTextarea, GlDeprecatedButton } from '@gitlab/ui'; import { GlToggle, GlFormTextarea, GlButton } from '@gitlab/ui';
describe('MaintenanceModeSettingsApp', () => { describe('MaintenanceModeSettingsApp', () => {
let wrapper; let wrapper;
...@@ -16,7 +16,7 @@ describe('MaintenanceModeSettingsApp', () => { ...@@ -16,7 +16,7 @@ describe('MaintenanceModeSettingsApp', () => {
const findMaintenanceModeSettingsContainer = () => wrapper.find('article'); const findMaintenanceModeSettingsContainer = () => wrapper.find('article');
const findGlToggle = () => wrapper.find(GlToggle); const findGlToggle = () => wrapper.find(GlToggle);
const findGlFormTextarea = () => wrapper.find(GlFormTextarea); const findGlFormTextarea = () => wrapper.find(GlFormTextarea);
const findGlButton = () => wrapper.find(GlDeprecatedButton); const findGlButton = () => wrapper.find(GlButton);
describe('template', () => { describe('template', () => {
beforeEach(() => { beforeEach(() => {
...@@ -35,7 +35,7 @@ describe('MaintenanceModeSettingsApp', () => { ...@@ -35,7 +35,7 @@ describe('MaintenanceModeSettingsApp', () => {
expect(findGlFormTextarea().exists()).toBe(true); expect(findGlFormTextarea().exists()).toBe(true);
}); });
it('renders the GlDeprecatedButton', () => { it('renders the GlButton', () => {
expect(findGlButton().exists()).toBe(true); expect(findGlButton().exists()).toBe(true);
}); });
}); });
......
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