Commit 8b272bb8 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch...

Merge branch '228968-replace-vue_shared-tooltip-with-gitlab-ui-s-tooltip-in-app-assets-javascripts-projects-tree' into 'master'

Replace vue_shared UI tooltip in commit_pipeline_status_component.vue

See merge request gitlab-org/gitlab!43818
parents 8d031a87 9a3d73a1
<script> <script>
import Visibility from 'visibilityjs'; import Visibility from 'visibilityjs';
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui';
import ciIcon from '~/vue_shared/components/ci_icon.vue'; import ciIcon from '~/vue_shared/components/ci_icon.vue';
import Poll from '~/lib/utils/poll'; import Poll from '~/lib/utils/poll';
import { deprecatedCreateFlash as Flash } from '~/flash'; import { deprecatedCreateFlash as Flash } from '~/flash';
import { __, s__, sprintf } from '~/locale'; import { __, s__, sprintf } from '~/locale';
import tooltip from '~/vue_shared/directives/tooltip';
import CommitPipelineService from '../services/commit_pipeline_service'; import CommitPipelineService from '../services/commit_pipeline_service';
export default { export default {
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
components: { components: {
ciIcon, ciIcon,
...@@ -97,7 +96,7 @@ export default { ...@@ -97,7 +96,7 @@ export default {
<gl-loading-icon v-if="isLoading" size="lg" label="Loading pipeline status" /> <gl-loading-icon v-if="isLoading" size="lg" label="Loading pipeline status" />
<a v-else :href="ciStatus.details_path"> <a v-else :href="ciStatus.details_path">
<ci-icon <ci-icon
v-tooltip v-gl-tooltip
:title="statusTitle" :title="statusTitle"
:aria-label="statusTitle" :aria-label="statusTitle"
:status="ciStatus" :status="ciStatus"
......
...@@ -142,7 +142,7 @@ describe('Commit pipeline status component', () => { ...@@ -142,7 +142,7 @@ describe('Commit pipeline status component', () => {
}); });
it('renders CI icon', () => { it('renders CI icon', () => {
expect(findCiIcon().attributes('data-original-title')).toEqual('Pipeline: pending'); expect(findCiIcon().attributes('title')).toEqual('Pipeline: pending');
expect(findCiIcon().props('status')).toEqual(mockCiStatus); expect(findCiIcon().props('status')).toEqual(mockCiStatus);
}); });
}); });
...@@ -161,7 +161,7 @@ describe('Commit pipeline status component', () => { ...@@ -161,7 +161,7 @@ describe('Commit pipeline status component', () => {
}); });
it('renders not found CI icon', () => { it('renders not found CI icon', () => {
expect(findCiIcon().attributes('data-original-title')).toEqual('Pipeline: not found'); expect(findCiIcon().attributes('title')).toEqual('Pipeline: not found');
expect(findCiIcon().props('status')).toEqual({ expect(findCiIcon().props('status')).toEqual({
text: 'not found', text: 'not found',
icon: 'status_notfound', icon: 'status_notfound',
......
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