Commit c6fe16f2 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch...

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

Migrate MR source branch deletion tooltip to GitLab UI

See merge request gitlab-org/gitlab!45134
parents 348e49d8 30d22d74
<script>
import { GlIcon, GlSprintf } from '@gitlab/ui';
import tooltip from '../../vue_shared/directives/tooltip';
import { GlIcon, GlSprintf, GlTooltipDirective } from '@gitlab/ui';
import { __ } from '../../locale';
export default {
......@@ -13,7 +12,7 @@ export default {
GlSprintf,
},
directives: {
tooltip,
GlTooltip: GlTooltipDirective,
},
};
</script>
......@@ -28,7 +27,7 @@ export default {
</gl-sprintf>
</span>
<gl-icon
v-tooltip
v-gl-tooltip.hover
:title="$options.i18n.tooltipTitle"
:aria-label="$options.i18n.tooltipTitle"
name="question-o"
......
......@@ -962,7 +962,7 @@ describe('ee merge request widget options', () => {
const tooltip = vm.$el.querySelector('[data-testid="question-o-icon"]');
expect(vm.$el.textContent).toContain('Deletes source branch');
expect(tooltip.getAttribute('data-original-title')).toBe(
expect(tooltip.getAttribute('title')).toBe(
'A user with write access to the source branch selected this option',
);
......
......@@ -536,7 +536,7 @@ describe('mrWidgetOptions', () => {
const tooltip = vm.$el.querySelector('[data-testid="question-o-icon"]');
expect(vm.$el.textContent).toContain('Deletes source branch');
expect(tooltip.getAttribute('data-original-title')).toBe(
expect(tooltip.getAttribute('title')).toBe(
'A user with write access to the source branch selected this option',
);
......
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