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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
1801b7fd
Commit
1801b7fd
authored
Jun 12, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed IDE jobs empty state showing when loading
Closes #47766
parent
60ded4eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
app/assets/javascripts/ide/components/jobs/detail.vue
app/assets/javascripts/ide/components/jobs/detail.vue
+1
-0
spec/javascripts/ide/components/jobs/detail_spec.js
spec/javascripts/ide/components/jobs/detail_spec.js
+5
-0
No files found.
app/assets/javascripts/ide/components/jobs/detail.vue
View file @
1801b7fd
...
@@ -122,6 +122,7 @@ export default {
...
@@ -122,6 +122,7 @@ export default {
@
scroll=
"scrollBuildLog"
@
scroll=
"scrollBuildLog"
>
>
<code
<code
v-show=
"!detailJob.isLoading"
class=
"bash"
class=
"bash"
v-html=
"jobOutput"
v-html=
"jobOutput"
>
>
...
...
spec/javascripts/ide/components/jobs/detail_spec.js
View file @
1801b7fd
...
@@ -62,6 +62,11 @@ describe('IDE jobs detail view', () => {
...
@@ -62,6 +62,11 @@ describe('IDE jobs detail view', () => {
expect
(
vm
.
$el
.
querySelector
(
'
.build-loader-animation
'
).
style
.
display
).
toBe
(
''
);
expect
(
vm
.
$el
.
querySelector
(
'
.build-loader-animation
'
).
style
.
display
).
toBe
(
''
);
});
});
it
(
'
hides output when loading
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.bash
'
)).
not
.
toBe
(
null
);
expect
(
vm
.
$el
.
querySelector
(
'
.bash
'
).
style
.
display
).
toBe
(
'
none
'
);
});
it
(
'
hide loading icon when isLoading is false
'
,
done
=>
{
it
(
'
hide loading icon when isLoading is false
'
,
done
=>
{
vm
.
$store
.
state
.
pipelines
.
detailJob
.
isLoading
=
false
;
vm
.
$store
.
state
.
pipelines
.
detailJob
.
isLoading
=
false
;
...
...
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