Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-04-07 15:11:42 +0300
committerPhil Hughes <me@iamphill.com>2017-04-07 18:37:19 +0300
commitac35566403652fc5cea0c42b273169584e5c9ce2 (patch)
tree01a94ff37f52da87ac0c0ec5edac16e92cce09e1 /spec/javascripts
parentaa8260d253a53f73f6c26c734c72fdd600f6e6d4 (diff)
Fixed duplicate jQuery AJAX spyon
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/merge_request_tabs_spec.js7
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) {