diff options
| author | Phil Hughes <me@iamphill.com> | 2018-06-12 13:53:13 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-06-12 13:53:13 +0100 |
| commit | 1801b7fd20b6732a8381878147943f32f564dc18 (patch) | |
| tree | d5e1ab0bc5881f23287ee1668da16ad78861584d | |
| parent | 60ded4eb5a82f0fb66750ca367ef08660af472b7 (diff) | |
| download | gitlab-ce-ide-job-loading-empty-state.tar.gz | |
Fixed IDE jobs empty state showing when loadingide-job-loading-empty-state
Closes #47766
| -rw-r--r-- | app/assets/javascripts/ide/components/jobs/detail.vue | 1 | ||||
| -rw-r--r-- | spec/javascripts/ide/components/jobs/detail_spec.js | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/components/jobs/detail.vue b/app/assets/javascripts/ide/components/jobs/detail.vue index 4d234a36fe5..6713b54efae 100644 --- a/app/assets/javascripts/ide/components/jobs/detail.vue +++ b/app/assets/javascripts/ide/components/jobs/detail.vue @@ -122,6 +122,7 @@ export default { @scroll="scrollBuildLog" > <code + v-show="!detailJob.isLoading" class="bash" v-html="jobOutput" > diff --git a/spec/javascripts/ide/components/jobs/detail_spec.js b/spec/javascripts/ide/components/jobs/detail_spec.js index 641ba06f653..8f8d4b9709e 100644 --- a/spec/javascripts/ide/components/jobs/detail_spec.js +++ b/spec/javascripts/ide/components/jobs/detail_spec.js @@ -62,6 +62,11 @@ describe('IDE jobs detail view', () => { 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 => { vm.$store.state.pipelines.detailJob.isLoading = false; |