diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-07 13:11:42 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-07 16:37:19 +0100 |
| commit | ac35566403652fc5cea0c42b273169584e5c9ce2 (patch) | |
| tree | 01a94ff37f52da87ac0c0ec5edac16e92cce09e1 | |
| parent | aa8260d253a53f73f6c26c734c72fdd600f6e6d4 (diff) | |
| download | gitlab-ce-karma-failure-fix.tar.gz | |
Fixed duplicate jQuery AJAX spyonkarma-failure-fix
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 6 | ||||
| -rw-r--r-- | spec/javascripts/merge_request_tabs_spec.js | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 8528e0800ae..7f6c74ce39a 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -102,10 +102,10 @@ import './flash'; destroyPipelinesView() { if (this.commitPipelinesTable) { - document.querySelector('#commit-pipeline-table-view') - .removeChild(this.commitPipelinesTable.$el); - this.commitPipelinesTable.$destroy(); + this.commitPipelinesTable = null; + + document.querySelector('#commit-pipeline-table-view').innerHTML = ''; } } diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 5354e536edc..69eb7b1a4cb 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -222,7 +222,9 @@ require('vendor/jquery.scrollTo'); describe('#tabShown', () => { beforeEach(function () { - spyOn($, 'ajax').and.callFake(function () {}); + spyOn($, 'ajax').and.callFake(function (options) { + options.success({ html: '' }); + }); loadFixtures('merge_requests/merge_request_with_task_list.html.raw'); }); @@ -230,9 +232,6 @@ require('vendor/jquery.scrollTo'); beforeEach(function () { this.class.diffViewType = () => 'parallel'; gl.Diff.prototype.diffViewType = () => 'parallel'; - spyOn($, 'ajax').and.callFake(function (options) { - options.success({ html: '' }); - }); }); it('maintains `container-limited` for pipelines tab', function (done) { |