Commit b4bbfc72 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'nmezzopera-fix-cleanup-tooltip-text' into 'master'

Cleanup Policy icon: use correct tooltip text

See merge request gitlab-org/gitlab!66454
parents db61a436 e770d5dc
<script> <script>
import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { GlTooltipDirective, GlIcon } from '@gitlab/ui';
import { import {
ASYNC_DELETE_IMAGE_ERROR_MESSAGE, CLEANUP_TIMED_OUT_ERROR_MESSAGE,
CLEANUP_STATUS_SCHEDULED, CLEANUP_STATUS_SCHEDULED,
CLEANUP_STATUS_ONGOING, CLEANUP_STATUS_ONGOING,
CLEANUP_STATUS_UNFINISHED, CLEANUP_STATUS_UNFINISHED,
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
CLEANUP_STATUS_SCHEDULED, CLEANUP_STATUS_SCHEDULED,
CLEANUP_STATUS_ONGOING, CLEANUP_STATUS_ONGOING,
CLEANUP_STATUS_UNFINISHED, CLEANUP_STATUS_UNFINISHED,
ASYNC_DELETE_IMAGE_ERROR_MESSAGE, CLEANUP_TIMED_OUT_ERROR_MESSAGE,
}, },
computed: { computed: {
showStatus() { showStatus() {
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
</span> </span>
<gl-icon <gl-icon
v-if="failedDelete" v-if="failedDelete"
v-gl-tooltip="{ title: $options.i18n.ASYNC_DELETE_IMAGE_ERROR_MESSAGE }" v-gl-tooltip="{ title: $options.i18n.CLEANUP_TIMED_OUT_ERROR_MESSAGE }"
:size="14" :size="14"
class="gl-text-black-normal" class="gl-text-black-normal"
data-testid="extra-info" data-testid="extra-info"
......
...@@ -2,7 +2,7 @@ import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; ...@@ -2,7 +2,7 @@ import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import CleanupStatus from '~/registry/explorer/components/list_page/cleanup_status.vue'; import CleanupStatus from '~/registry/explorer/components/list_page/cleanup_status.vue';
import { import {
ASYNC_DELETE_IMAGE_ERROR_MESSAGE, CLEANUP_TIMED_OUT_ERROR_MESSAGE,
CLEANUP_STATUS_SCHEDULED, CLEANUP_STATUS_SCHEDULED,
CLEANUP_STATUS_ONGOING, CLEANUP_STATUS_ONGOING,
CLEANUP_STATUS_UNFINISHED, CLEANUP_STATUS_UNFINISHED,
...@@ -81,7 +81,7 @@ describe('cleanup_status', () => { ...@@ -81,7 +81,7 @@ describe('cleanup_status', () => {
const tooltip = getBinding(findExtraInfoIcon().element, 'gl-tooltip'); const tooltip = getBinding(findExtraInfoIcon().element, 'gl-tooltip');
expect(tooltip.value.title).toBe(ASYNC_DELETE_IMAGE_ERROR_MESSAGE); expect(tooltip.value.title).toBe(CLEANUP_TIMED_OUT_ERROR_MESSAGE);
}); });
}); });
}); });
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