summaryrefslogtreecommitdiff
path: root/spec/javascripts/support
diff options
context:
space:
mode:
Diffstat (limited to 'spec/javascripts/support')
-rw-r--r--spec/javascripts/support/jasmine_helper.rb14
1 files changed, 10 insertions, 4 deletions
diff --git a/spec/javascripts/support/jasmine_helper.rb b/spec/javascripts/support/jasmine_helper.rb
index 34b418a9ca3..b4919802afe 100644
--- a/spec/javascripts/support/jasmine_helper.rb
+++ b/spec/javascripts/support/jasmine_helper.rb
@@ -1,5 +1,11 @@
-WebMock.allow_net_connect!
+#Use this file to set/override Jasmine configuration options
+#You can remove it if you don't need it.
+#This file is loaded *after* jasmine.yml is interpreted.
+#
+#Example: using a different boot file.
+#Jasmine.configure do |config|
+# config.boot_dir = '/absolute/path/to/boot_dir'
+# config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
+#end
+#
-Jasmine.configure do |config|
- config.browser = :phantomjs
-end