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
109f2006
Commit
109f2006
authored
Oct 09, 2020
by
Marcel Amirault
Committed by
Simon Knox
Oct 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace vue_shared with GitLab UI tooltip in job_container_item.vue
parent
e275fdd0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
app/assets/javascripts/jobs/components/job_container_item.vue
...assets/javascripts/jobs/components/job_container_item.vue
+3
-5
spec/features/projects/jobs/user_browses_job_spec.rb
spec/features/projects/jobs/user_browses_job_spec.rb
+2
-2
spec/frontend/jobs/components/job_container_item_spec.js
spec/frontend/jobs/components/job_container_item_spec.js
+1
-1
No files found.
app/assets/javascripts/jobs/components/job_container_item.vue
View file @
109f2006
<
script
>
import
{
GlLink
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
{
GlLink
,
GlIcon
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
CiIcon
from
'
~/vue_shared/components/ci_icon.vue
'
;
import
delayedJobMixin
from
'
~/jobs/mixins/delayed_job_mixin
'
;
import
{
sprintf
}
from
'
~/locale
'
;
...
...
@@ -12,7 +11,7 @@ export default {
GlLink
,
},
directives
:
{
tooltip
,
GlTooltip
:
GlTooltipDirective
,
},
mixins
:
[
delayedJobMixin
],
props
:
{
...
...
@@ -49,10 +48,9 @@ export default {
}"
>
<gl-link
v-tooltip
v-
gl-
tooltip
:href=
"job.status.details_path"
:title=
"tooltipText"
data-boundary=
"viewport"
class=
"js-job-link d-flex"
>
<gl-icon
...
...
spec/features/projects/jobs/user_browses_job_spec.rb
View file @
109f2006
...
...
@@ -43,7 +43,7 @@ RSpec.describe 'User browses a job', :js do
wait_for_all_requests
within
(
'.builds-container'
)
do
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
...
...
@@ -55,7 +55,7 @@ RSpec.describe 'User browses a job', :js do
wait_for_all_requests
within
(
'.builds-container'
)
do
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
...
...
spec/frontend/jobs/components/job_container_item_spec.js
View file @
109f2006
...
...
@@ -90,7 +90,7 @@ describe('JobContainerItem', () => {
Vue
.
nextTick
()
.
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)
'
,
);
})
...
...
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