From ac35566403652fc5cea0c42b273169584e5c9ce2 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Fri, 7 Apr 2017 13:11:42 +0100 Subject: Fixed duplicate jQuery AJAX spyon --- spec/javascripts/merge_request_tabs_spec.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'spec/javascripts') 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) { -- cgit v1.2.3 From 4bdbccfc066b3ff1ed3bd29a6266215ed2421df3 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 7 Apr 2017 19:36:09 +0000 Subject: Remove Vue from main bundle and disable production warnings --- spec/javascripts/merge_request_tabs_spec.js | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/javascripts') diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 69eb7b1a4cb..e437333d522 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -1,6 +1,7 @@ /* eslint-disable no-var, comma-dangle, object-shorthand */ require('~/merge_request_tabs'); +require('~/commit/pipelines/pipelines_bundle.js'); require('~/breakpoints'); require('~/lib/utils/common_utils'); require('~/diff'); -- cgit v1.2.3