diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 16:03:24 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 16:03:24 +0200 |
commit | bbd8525d75d6dba4dd6f5dc996073e61f47e43dc (patch) | |
tree | 1e941c9e4d28f34d525a4a01103ee46ca1ec253c /spec/javascripts/support | |
parent | 5a2ae296fafb434e9f6a72118b02ddc1f584a9a9 (diff) | |
download | gitlab-ce-bbd8525d75d6dba4dd6f5dc996073e61f47e43dc.tar.gz |
Update jasmine gem to work with rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/javascripts/support')
-rw-r--r-- | spec/javascripts/support/jasmine_helper.rb | 14 |
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 |