Commit 286e2df3 authored by David O'Regan's avatar David O'Regan Committed by Kushal Pandya

fix(service_desk_setting): update service desk project to use GlLoadingIcon...

fix(service_desk_setting): update service desk project to use GlLoadingIcon over font awesome spinner
parent dd5308b7
---
title: update service desk project to use GlLoadingIcon over font awesome spinner
merge_request:
author: Oregand
type: changed
<script> <script>
import { GlButton, GlFormSelect, GlToggle } from '@gitlab/ui'; import { GlButton, GlFormSelect, GlToggle, GlLoadingIcon } from '@gitlab/ui';
import { __ } from '~/locale'; import { __ } from '~/locale';
import tooltip from '~/vue_shared/directives/tooltip'; import tooltip from '~/vue_shared/directives/tooltip';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
...@@ -15,6 +15,7 @@ export default { ...@@ -15,6 +15,7 @@ export default {
GlButton, GlButton,
GlFormSelect, GlFormSelect,
GlToggle, GlToggle,
GlLoadingIcon,
}, },
props: { props: {
isEnabled: { isEnabled: {
...@@ -112,7 +113,7 @@ export default { ...@@ -112,7 +113,7 @@ export default {
</div> </div>
</template> </template>
<template v-else> <template v-else>
<i class="fa fa-spinner fa-spin" aria-hidden="true"></i> <gl-loading-icon :inline="true" />
<span class="sr-only">{{ __('Fetching incoming email') }}</span> <span class="sr-only">{{ __('Fetching incoming email') }}</span>
</template> </template>
......
import { shallowMount, mount } from '@vue/test-utils'; import { shallowMount, mount } from '@vue/test-utils';
import { GlLoadingIcon } from '@gitlab/ui';
import eventHub from 'ee/projects/settings_service_desk/event_hub'; import eventHub from 'ee/projects/settings_service_desk/event_hub';
import ServiceDeskSetting from 'ee/projects/settings_service_desk/components/service_desk_setting.vue'; import ServiceDeskSetting from 'ee/projects/settings_service_desk/components/service_desk_setting.vue';
...@@ -33,7 +34,7 @@ describe('ServiceDeskSetting', () => { ...@@ -33,7 +34,7 @@ describe('ServiceDeskSetting', () => {
}); });
it('should see loading spinner and not the incoming email', () => { it('should see loading spinner and not the incoming email', () => {
expect(wrapper.contains('.fa-spinner')).toBe(true); expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
expect(wrapper.contains('.incoming-email')).toBe(false); expect(wrapper.contains('.incoming-email')).toBe(false);
}); });
}); });
...@@ -73,7 +74,7 @@ describe('ServiceDeskSetting', () => { ...@@ -73,7 +74,7 @@ describe('ServiceDeskSetting', () => {
it('should see email and not the loading spinner', () => { it('should see email and not the loading spinner', () => {
expect(wrapper.find('.incoming-email').element.value).toEqual(incomingEmail); expect(wrapper.find('.incoming-email').element.value).toEqual(incomingEmail);
expect(wrapper.contains('.fa-spinner')).toBe(false); expect(wrapper.find(GlLoadingIcon).exists()).toBe(false);
}); });
it('renders a copy to clipboard button', () => { it('renders a copy to clipboard button', () => {
......
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