diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-04-07 10:56:01 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-04-07 11:00:08 -0500 |
| commit | a8f5dffa944945291325a7546aecbd991f5474ef (patch) | |
| tree | 82c84fee3cd63cb5d862cc626908600fc47a63c5 | |
| parent | 2494088021f0908c126542346faef5d3b02e94b3 (diff) | |
| parent | ac35566403652fc5cea0c42b273169584e5c9ce2 (diff) | |
| download | gitlab-ce-30151-fix-vue-production-warnings.tar.gz | |
Merge branch 'karma-failure-fix' into 30151-fix-vue-production-warnings30151-fix-vue-production-warnings
* karma-failure-fix:
Fixed duplicate jQuery AJAX spyon
| -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 486ecce16b2..f7f6a773036 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -99,10 +99,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 60f2f2441fb..e437333d522 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -223,7 +223,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'); }); @@ -231,9 +233,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) { |