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:
authorMike Greiling <mike@pixelcog.com>2016-12-31 03:14:33 +0300
committerMike Greiling <mike@pixelcog.com>2017-01-05 23:11:07 +0300
commit7a2a9bb45e681fdcd707fdbe3fbcc3ce2e17663c (patch)
tree94981286ccd9cf5ba26684288994e3a50dd21866 /spec/javascripts/spec_helper.js
parent10d483eaaaccc336399fa83a0ac5f7ecd9cea352 (diff)
replace Teaspoon fixture methods with jasmine-jquery methods to reduce dependency on Teaspoon
Diffstat (limited to 'spec/javascripts/spec_helper.js')
-rw-r--r--spec/javascripts/spec_helper.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/javascripts/spec_helper.js b/spec/javascripts/spec_helper.js
index 831dfada952..f8e3aca29fa 100644
--- a/spec/javascripts/spec_helper.js
+++ b/spec/javascripts/spec_helper.js
@@ -37,12 +37,12 @@
// file as a manifest.
// For more information: http://github.com/modeset/teaspoon
-(function() {
-
-
-}).call(this);
+// set our fixtures path
+jasmine.getFixtures().fixturesPath = '/teaspoon/fixtures';
+jasmine.getJSONFixtures().fixturesPath = '/teaspoon/fixtures';
// defined in ActionDispatch::TestRequest
// see https://github.com/rails/rails/blob/v4.2.7.1/actionpack/lib/action_dispatch/testing/test_request.rb#L7
window.gl = window.gl || {};
-gl.TEST_HOST = 'http://test.host';
+window.gl.TEST_HOST = 'http://test.host';
+window.gon = window.gon || {};