Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e770d5dc
Commit
e770d5dc
authored
Jul 20, 2021
by
Nicolò Maria Mezzopera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the correct text for tooltip
- source - tests Changelog: fixed
parent
87fe5f40
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/registry/explorer/components/list_page/cleanup_status.vue
...registry/explorer/components/list_page/cleanup_status.vue
+3
-3
spec/frontend/registry/explorer/components/list_page/cleanup_status_spec.js
...stry/explorer/components/list_page/cleanup_status_spec.js
+2
-2
No files found.
app/assets/javascripts/registry/explorer/components/list_page/cleanup_status.vue
View file @
e770d5dc
<
script
>
import
{
GlTooltipDirective
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
ASYNC_DELETE_IMAGE
_ERROR_MESSAGE
,
CLEANUP_TIMED_OUT
_ERROR_MESSAGE
,
CLEANUP_STATUS_SCHEDULED
,
CLEANUP_STATUS_ONGOING
,
CLEANUP_STATUS_UNFINISHED
,
...
...
@@ -34,7 +34,7 @@ export default {
CLEANUP_STATUS_SCHEDULED
,
CLEANUP_STATUS_ONGOING
,
CLEANUP_STATUS_UNFINISHED
,
ASYNC_DELETE_IMAGE
_ERROR_MESSAGE
,
CLEANUP_TIMED_OUT
_ERROR_MESSAGE
,
},
computed
:
{
showStatus
()
{
...
...
@@ -61,7 +61,7 @@ export default {
</span>
<gl-icon
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"
class="gl-text-black-normal"
data-testid="extra-info"
...
...
spec/frontend/registry/explorer/components/list_page/cleanup_status_spec.js
View file @
e770d5dc
...
...
@@ -2,7 +2,7 @@ import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
import
{
shallowMountExtended
}
from
'
helpers/vue_test_utils_helper
'
;
import
CleanupStatus
from
'
~/registry/explorer/components/list_page/cleanup_status.vue
'
;
import
{
ASYNC_DELETE_IMAGE
_ERROR_MESSAGE
,
CLEANUP_TIMED_OUT
_ERROR_MESSAGE
,
CLEANUP_STATUS_SCHEDULED
,
CLEANUP_STATUS_ONGOING
,
CLEANUP_STATUS_UNFINISHED
,
...
...
@@ -81,7 +81,7 @@ describe('cleanup_status', () => {
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
);
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment