Commit 10a190db authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'ide-job-loading-empty-state' into 'master'

Fixed IDE jobs empty state showing when loading

Closes #47766

See merge request gitlab-org/gitlab-ce!19706
parents 893c824e 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"
> >
......
...@@ -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;
......
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