diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-10-11 21:33:02 +0300 |
---|---|---|
committer | Cindy Pallares <cindy@gitlab.com> | 2018-10-12 00:27:35 +0300 |
commit | dd411a204e010f2eea4a5d3e5797533de1b70a73 (patch) | |
tree | f2cfd05557f671661df918198d7b55c38f3842d3 /spec/javascripts/jobs | |
parent | 31ae0e5d00fc9378ebfb3a71000ef5e1664aefc6 (diff) |
Merge branch '52570-erased-block' into 'master'
Fix erased block not being rendered when job was erased
Closes #52570
See merge request gitlab-org/gitlab-ce!22294
Diffstat (limited to 'spec/javascripts/jobs')
-rw-r--r-- | spec/javascripts/jobs/components/job_app_spec.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/spec/javascripts/jobs/components/job_app_spec.js b/spec/javascripts/jobs/components/job_app_spec.js index e02eb9723fe..ea6eb18cb23 100644 --- a/spec/javascripts/jobs/components/job_app_spec.js +++ b/spec/javascripts/jobs/components/job_app_spec.js @@ -223,7 +223,6 @@ describe('Job App ', () => { store.dispatch( 'receiveJobSuccess', Object.assign({}, job, { - erased: true, erased_by: { username: 'root', web_url: 'gitlab.com/root', @@ -237,18 +236,18 @@ describe('Job App ', () => { store, }); - expect(vm.$el.querySelector('.js-job-erased')).not.toBeNull(); + expect(vm.$el.querySelector('.js-job-erased-block')).not.toBeNull(); }); it('does not render erased block when `erased` is false', () => { - store.dispatch('receiveJobSuccess', Object.assign({}, job, { erased: false })); + store.dispatch('receiveJobSuccess', Object.assign({}, job, { erased_at: null })); vm = mountComponentWithStore(Component, { props, store, }); - expect(vm.$el.querySelector('.js-job-erased')).toBeNull(); + expect(vm.$el.querySelector('.js-job-erased-block')).toBeNull(); }); }); |