diff options
| author | Philip Arndt <git@p.arndt.io> | 2015-02-26 08:53:03 +1300 |
|---|---|---|
| committer | Philip Arndt <git@p.arndt.io> | 2015-02-26 08:53:09 +1300 |
| commit | dff7379738dd1318783dd3135a59a480d3f1432f (patch) | |
| tree | 9dbd26ce7abf704de3e7cf34f572973287f1ddbd | |
| parent | be8ace0dfbe358c3621148e3b7b87411486ad852 (diff) | |
| parent | f439d75923f4af0d432b6e48a5f696a8c18dea64 (diff) | |
| download | refinerycms-blog-dff7379738dd1318783dd3135a59a480d3f1432f.tar.gz refinerycms-blog-dff7379738dd1318783dd3135a59a480d3f1432f.tar.bz2 refinerycms-blog-dff7379738dd1318783dd3135a59a480d3f1432f.zip | |
Merge remote-tracking branch 'anitagraham/rails-4-2'
Closes #419
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -13,7 +13,7 @@ end group :test do gem 'pry' gem 'launchy' - gem 'selenium-webdriver' + gem 'poltergeist' end # Database Configuration diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a9557c4..7b20bf0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,5 @@ require 'rubygems' +require 'capybara/poltergeist' # Configure Rails Environment ENV["RAILS_ENV"] ||= 'test' @@ -17,7 +18,7 @@ RSpec.configure do |config| end # set javascript driver for capybara -Capybara.javascript_driver = :selenium +Capybara.javascript_driver = :poltergeist # Requires supporting files with custom matchers and macros, etc, # in ./support/ and its subdirectories including factories. |