Commit fd16c892 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'karma-failure-fix' into 'master'

Fixed duplicate jQuery AJAX spyon

See merge request !10531
parents 8631779b ac355664
...@@ -102,10 +102,10 @@ import './flash'; ...@@ -102,10 +102,10 @@ import './flash';
destroyPipelinesView() { destroyPipelinesView() {
if (this.commitPipelinesTable) { if (this.commitPipelinesTable) {
document.querySelector('#commit-pipeline-table-view')
.removeChild(this.commitPipelinesTable.$el);
this.commitPipelinesTable.$destroy(); this.commitPipelinesTable.$destroy();
this.commitPipelinesTable = null;
document.querySelector('#commit-pipeline-table-view').innerHTML = '';
} }
} }
......
...@@ -222,7 +222,9 @@ require('vendor/jquery.scrollTo'); ...@@ -222,7 +222,9 @@ require('vendor/jquery.scrollTo');
describe('#tabShown', () => { describe('#tabShown', () => {
beforeEach(function () { 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'); loadFixtures('merge_requests/merge_request_with_task_list.html.raw');
}); });
...@@ -230,9 +232,6 @@ require('vendor/jquery.scrollTo'); ...@@ -230,9 +232,6 @@ require('vendor/jquery.scrollTo');
beforeEach(function () { beforeEach(function () {
this.class.diffViewType = () => 'parallel'; this.class.diffViewType = () => 'parallel';
gl.Diff.prototype.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) { it('maintains `container-limited` for pipelines tab', function (done) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment