deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1725 from maxmeyer/feature/phantomjs

Browse source 
Added phantomjs as gem to make test suite pass
This commit is contained in:
Thomas Reynolds 2016-01-05 10:34:46 -08:00
parent 41212d7fa3 b0a4d53963
commit bfb6a7fa16
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -28,6 +28,7 @@ gem 'rubydns', '~> 1.0.1', require: false
# To test javascript
gem 'poltergeist', '~> 1.8', require: false
gem 'phantomjs', '~> 1.9.8.0', require: false
# For less, note there is no compatible JS runtime for windows
gem 'therubyrhino', '>= 2.0', platforms: :jruby

2
middleman-core/features/support/env.rb
View file

@ -5,7 +5,7 @@ require 'sassc'
require 'simplecov'
SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
require 'capybara/poltergeist'
require 'phantomjs/poltergeist'
Capybara.javascript_driver = :poltergeist
require 'coveralls'