Skip to content

Commit

Permalink
Prevent automatic phantomjs install
Browse files Browse the repository at this point in the history
* Use forked gem with phantomjs config added
* Temporarily use this until a PR on gem is accepted
* See: jasmine/jasmine-gem#213
  • Loading branch information
fofr committed May 21, 2014
1 parent f62fecc commit b938bff
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Expand Up @@ -2,3 +2,5 @@ source 'https://rubygems.org'

# Specify your gem's dependencies in govuk_admin_template.gemspec
gemspec

gem 'jasmine', :git => "git://github.com/fofr/jasmine-gem.git", :branch => "preventable-phantomjs-install"
2 changes: 1 addition & 1 deletion govuk_admin_template.gemspec
Expand Up @@ -19,9 +19,9 @@ Gem::Specification.new do |gem|
gem.add_dependency 'bootstrap-sass', '3.1.0'
gem.add_dependency 'jquery-rails', '3.0.4'

# There are some further development dependencies in the gemfile
gem.add_development_dependency 'rails', '3.2.18'
gem.add_development_dependency 'sass-rails', '3.2.6'
gem.add_development_dependency 'rspec-rails', '2.14.2'
gem.add_development_dependency 'jasmine', '2.0.0'
gem.add_development_dependency 'capybara', '2.2.1'
end
12 changes: 3 additions & 9 deletions spec/javascripts/support/jasmine_helper.rb
@@ -1,11 +1,5 @@
#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.prevent_phantom_js_auto_install = true
end

0 comments on commit b938bff

Please sign in to comment.