Commit e885b3fe authored by Simon Knox's avatar Simon Knox

Merge branch...

Merge branch '228976-replace-vue_shared-tooltip-with-gitlab-ui-s-tooltip-in-app-assets-javascripts-jobs' into 'master'

Replace vue_shared with GitLab UI tooltip in job_container_item.vue

See merge request gitlab-org/gitlab!44678
parents e7b9113a 109f2006
<script> <script>
import { GlLink, GlIcon } from '@gitlab/ui'; import { GlLink, GlIcon, GlTooltipDirective } from '@gitlab/ui';
import tooltip from '~/vue_shared/directives/tooltip';
import CiIcon from '~/vue_shared/components/ci_icon.vue'; import CiIcon from '~/vue_shared/components/ci_icon.vue';
import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin'; import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin';
import { sprintf } from '~/locale'; import { sprintf } from '~/locale';
...@@ -12,7 +11,7 @@ export default { ...@@ -12,7 +11,7 @@ export default {
GlLink, GlLink,
}, },
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
mixins: [delayedJobMixin], mixins: [delayedJobMixin],
props: { props: {
...@@ -49,10 +48,9 @@ export default { ...@@ -49,10 +48,9 @@ export default {
}" }"
> >
<gl-link <gl-link
v-tooltip v-gl-tooltip
:href="job.status.details_path" :href="job.status.details_path"
:title="tooltipText" :title="tooltipText"
data-boundary="viewport"
class="js-job-link d-flex" class="js-job-link d-flex"
> >
<gl-icon <gl-icon
......
...@@ -43,7 +43,7 @@ RSpec.describe 'User browses a job', :js do ...@@ -43,7 +43,7 @@ RSpec.describe 'User browses a job', :js do
wait_for_all_requests wait_for_all_requests
within('.builds-container') do within('.builds-container') do
expect(page).to have_selector( expect(page).to have_selector(
".build-job > a[data-original-title='test - failed - (unknown failure)']") ".build-job > a[title='test - failed - (unknown failure)']")
end end
end end
end end
...@@ -55,7 +55,7 @@ RSpec.describe 'User browses a job', :js do ...@@ -55,7 +55,7 @@ RSpec.describe 'User browses a job', :js do
wait_for_all_requests wait_for_all_requests
within('.builds-container') do within('.builds-container') do
expect(page).to have_selector( expect(page).to have_selector(
".build-job > a[data-original-title='test - failed - (unknown failure) (retried)']") ".build-job > a[title='test - failed - (unknown failure) (retried)']")
end end
end end
end end
......
...@@ -90,7 +90,7 @@ describe('JobContainerItem', () => { ...@@ -90,7 +90,7 @@ describe('JobContainerItem', () => {
Vue.nextTick() Vue.nextTick()
.then(() => { .then(() => {
expect(vm.$el.querySelector('.js-job-link').getAttribute('data-original-title')).toEqual( expect(vm.$el.querySelector('.js-job-link').getAttribute('title')).toEqual(
'delayed job - delayed manual action (00:22:17)', 'delayed job - delayed manual action (00:22:17)',
); );
}) })
......
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