Skip to content

Commit

Permalink
Use poltergeist/phantomjs instead of capybara-webkit (see #206)
Browse files Browse the repository at this point in the history
Also added more specific development dependency version matchers to gemspec
  • Loading branch information
colszowka committed Mar 23, 2013
1 parent ef4dbd6 commit f505f70
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
5 changes: 2 additions & 3 deletions features/support/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
require 'aruba/cucumber'
require 'aruba/jruby' if RUBY_ENGINE == 'jruby'
require 'capybara/cucumber'
require 'capybara/webkit'
require 'phantomjs/poltergeist'

# Fake rack app for capybara that just returns the latest coverage report from aruba temp project dir
Capybara.app = lambda { |env|
Expand All @@ -19,8 +19,7 @@
[File.read(File.join(File.dirname(__FILE__), '../../tmp/aruba/project/coverage', request_path))]]
}

# https://github.com/thoughtbot/capybara-webkit
Capybara.default_driver = Capybara.javascript_driver = :webkit
Capybara.default_driver = Capybara.javascript_driver = :poltergeist

Before do
# JRuby takes it's time... See https://github.com/cucumber/aruba/issues/134
Expand Down
15 changes: 8 additions & 7 deletions simplecov.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ Gem::Specification.new do |gem|
gem.add_dependency 'multi_json', '~> 1.0'
gem.add_dependency 'simplecov-html', '~> 0.7.1'

gem.add_development_dependency 'aruba'
gem.add_development_dependency 'aruba', '~> 0.5.1'
gem.add_development_dependency 'capybara', '~> 2.0'
gem.add_development_dependency 'capybara-webkit'
gem.add_development_dependency 'appraisal'
gem.add_development_dependency 'cucumber', '>= 1.1.4'
gem.add_development_dependency 'rake'
gem.add_development_dependency 'rspec', '>= 2.1'
gem.add_development_dependency 'shoulda'
gem.add_development_dependency 'poltergeist', '~> 1.1.0'
gem.add_development_dependency 'phantomjs', '~> 1.8.1'
gem.add_development_dependency 'appraisal', '~> 0.5.1'
gem.add_development_dependency 'cucumber', '~> 1.2.3'
gem.add_development_dependency 'rake', '~> 10.0.3'
gem.add_development_dependency 'rspec', '~> 2.13.0'
gem.add_development_dependency 'shoulda', '~> 3.4.0'

gem.files = `git ls-files`.split("\n")
gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
Expand Down

0 comments on commit f505f70

Please sign in to comment.