diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-01 16:15:24 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-01 16:15:24 +0000 |
| commit | 01a978593952456f8ff97cc3d415b3dfc5e421e8 (patch) | |
| tree | ba61e5397d12def53cf99438d501328d3113029a /spec/javascripts | |
| parent | 8608da87064f4423abd745435736ac3e65a58054 (diff) | |
| parent | cfa0c6592a882f0792240ba70b5ce8fff2b46130 (diff) | |
| download | gitlab-ce-01a978593952456f8ff97cc3d415b3dfc5e421e8.tar.gz | |
Merge branch '63590-pipeline-actions-cause-full-refresh' into 'master'
Resolve "Pipeline actions cause full refresh"
Closes #63590
See merge request gitlab-org/gitlab-ce!30190
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/pipelines/pipelines_spec.js | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/spec/javascripts/pipelines/pipelines_spec.js b/spec/javascripts/pipelines/pipelines_spec.js index 78187b69563..daa898ca687 100644 --- a/spec/javascripts/pipelines/pipelines_spec.js +++ b/spec/javascripts/pipelines/pipelines_spec.js @@ -736,10 +736,9 @@ describe('Pipelines', () => { }); describe('when a request is being made', () => { - it('stops polling, cancels the request, fetches pipelines & restarts polling', done => { + it('stops polling, cancels the request, & restarts polling', done => { spyOn(vm.poll, 'stop'); spyOn(vm.poll, 'restart'); - spyOn(vm, 'getPipelines').and.returnValue(Promise.resolve()); spyOn(vm.service.cancelationSource, 'cancel').and.callThrough(); setTimeout(() => { @@ -754,7 +753,6 @@ describe('Pipelines', () => { expect(vm.poll.stop).toHaveBeenCalled(); setTimeout(() => { - expect(vm.getPipelines).toHaveBeenCalled(); expect(vm.poll.restart).toHaveBeenCalled(); done(); }, 0); @@ -765,10 +763,9 @@ describe('Pipelines', () => { }); describe('when no request is being made', () => { - it('stops polling, fetches pipelines & restarts polling', done => { + it('stops polling & restarts polling', done => { spyOn(vm.poll, 'stop'); spyOn(vm.poll, 'restart'); - spyOn(vm, 'getPipelines').and.returnValue(Promise.resolve()); setTimeout(() => { vm.$el.querySelector('.js-builds-dropdown-button').click(); @@ -776,7 +773,6 @@ describe('Pipelines', () => { expect(vm.poll.stop).toHaveBeenCalled(); setTimeout(() => { - expect(vm.getPipelines).toHaveBeenCalled(); expect(vm.poll.restart).toHaveBeenCalled(); done(); }, 0); |
