From bbd8525d75d6dba4dd6f5dc996073e61f47e43dc Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 10 Dec 2013 16:03:24 +0200 Subject: Update jasmine gem to work with rails4 Signed-off-by: Dmitriy Zaporozhets --- spec/javascripts/support/jasmine_helper.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'spec/javascripts/support') 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 -- cgit v1.2.1