Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
GitLab Community Edition
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
14,493
Issues
14,493
List
Boards
Labels
Service Desk
Milestones
Merge Requests
811
Merge Requests
811
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GitLab.org
GitLab Community Edition
Commits
ec37b1b2
You need to sign in or sign up before continuing.
Verified
Commit
ec37b1b2
authored
Jun 06, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added empty state
parent
b9928718
Pipeline
#23284069
passed with stages
in 32 minutes and 8 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
2 deletions
+27
-2
detail.vue
app/assets/javascripts/ide/components/jobs/detail.vue
+5
-1
item.vue
app/assets/javascripts/ide/components/jobs/item.vue
+1
-0
repo.scss
app/assets/stylesheets/pages/repo.scss
+1
-1
detail_spec.js
spec/javascripts/ide/components/jobs/detail_spec.js
+10
-0
item_spec.js
spec/javascripts/ide/components/jobs/item_spec.js
+10
-0
No files found.
app/assets/javascripts/ide/components/jobs/detail.vue
View file @
ec37b1b2
<
script
>
import
{
mapActions
,
mapState
}
from
'vuex'
;
import
_
from
'underscore'
;
import
{
__
}
from
'../../../locale'
;
import
tooltip
from
'../../../vue_shared/directives/tooltip'
;
import
Icon
from
'../../../vue_shared/components/icon.vue'
;
import
ScrollButton
from
'./detail/scroll_button.vue'
;
...
...
@@ -33,6 +34,9 @@ export default {
isScrolledToTop
()
{
return
this
.
scrollPos
===
scrollPositions
.
top
;
},
jobOutput
()
{
return
this
.
detailJob
.
output
||
__
(
'No messages were logged'
);
},
},
mounted
()
{
this
.
getTrace
();
...
...
@@ -119,7 +123,7 @@ export default {
>
<code
class=
"bash"
v-html=
"
detailJob.o
utput"
v-html=
"
jobO
utput"
>
</code>
<div
...
...
app/assets/javascripts/ide/components/jobs/item.vue
View file @
ec37b1b2
...
...
@@ -32,6 +32,7 @@ export default {
/>
<div
class=
"ml-auto align-self-center"
>
<button
v-if=
"job.started"
type=
"button"
class=
"btn btn-default btn-sm"
@
click=
"clickViewLog"
...
...
app/assets/stylesheets/pages/repo.scss
View file @
ec37b1b2
...
...
@@ -1207,7 +1207,7 @@
margin-left
:
-
$gl-padding
;
}
.top-bar
{
&
.build-page
.top-bar
{
top
:
0
;
font-size
:
12px
;
border-top-right-radius
:
$border-radius-default
;
...
...
spec/javascripts/ide/components/jobs/detail_spec.js
View file @
ec37b1b2
...
...
@@ -47,6 +47,16 @@ describe('IDE jobs detail view', () => {
expect
(
vm
.
$el
.
querySelector
(
'.bash'
).
textContent
).
toContain
(
'testing'
);
});
it
(
'renders empty message output'
,
done
=>
{
vm
.
$store
.
state
.
pipelines
.
detailJob
.
output
=
''
;
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'.bash'
).
textContent
).
toContain
(
'No messages were logged'
);
done
();
});
});
it
(
'renders loading icon'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'.build-loader-animation'
)).
not
.
toBe
(
null
);
expect
(
vm
.
$el
.
querySelector
(
'.build-loader-animation'
).
style
.
display
).
toBe
(
''
);
...
...
spec/javascripts/ide/components/jobs/item_spec.js
View file @
ec37b1b2
...
...
@@ -26,4 +26,14 @@ describe('IDE jobs item', () => {
it
(
'renders CI icon'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'.ic-status_passed_borderless'
)).
not
.
toBe
(
null
);
});
it
(
'does not render view logs button if not started'
,
done
=>
{
vm
.
job
.
started
=
false
;
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'.btn'
)).
toBe
(
null
);
done
();
});
});
});
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