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

Fixed duplicate jQuery AJAX spyon

See merge request !10531

1 files changed, 3 insertions, 4 deletions

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) {