Merge update-to-chromedriver-for-js-tests into update-to-react-16

Author: BookOfGreg

.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 sudo: required
 dist: trusty
+addons:
+  chrome: stable
 cache:
   bundler: true
   yarn: true
@@ -32,9 +34,9 @@ matrix:
     - rvm: 2.1
       gemfile: gemfiles/rails_3.2.gemfile
     - rvm: 2.1
-      gemfile: rails_4.0.5.gemfile
+      gemfile: gemfiles/rails_4.0.5.gemfile
     - rvm: 2.1
-      gemfile: rails_4.0_with_therubyracer.gemfile
+      gemfile: gemfiles/rails_4.0_with_therubyracer.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
     - rvm: 2.1
@@ -76,12 +78,6 @@ matrix:
     - rvm: jruby-9.1.9.0
 
 before_install:
-  - nvm install 7.8.0 && nvm use 7.8.0
-  - mkdir travis-phantomjs
-  - wget https://rmosolgo.github.io/assets/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
-  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
-  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
-  - phantomjs --version
   # Repo for Yarn
   - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
   - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list

README.md

@@ -475,7 +475,7 @@ You can also specify this option in `react_component`:
 ## Related Projects
 
 - [react\_on\_rails Gem](https://github.com/shakacode/react_on_rails): Integration of React with Rails utilizing Webpack, Babel, React, Redux, React-Router.
-- [Ruby Hyperloop](http://ruby-hyperloop.io/): Use Ruby to build reactive user interfaces with React.
+- [Ruby Hyperloop](http://ruby-hyperloop.org/): Use Ruby to build reactive user interfaces with React.
 - [react-rails-hot-loader](https://github.com/rmosolgo/react-rails-hot-loader) is a simple live-reloader for `react-rails`.
 - [react-rails-benchmark_renderer](https://github.com/pboling/react-rails-benchmark_renderer) adds performance instrumentation to server rendering.
 - [The Free React on Rails Course](https://learnetto.com/users/hrishio/courses/the-free-react-on-rails-5-course) A free video course which teaches the basics of React and how to get started using it in Rails with `react-rails`.

react-rails.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'guard-minitest'
   s.add_development_dependency 'jbuilder'
   s.add_development_dependency 'listen', '~> 3.0.0' # support Ruby 2.1
-  s.add_development_dependency 'poltergeist', '>= 0.3.3'
+  s.add_development_dependency 'chromedriver-helper'
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'test-unit', '~> 2.5'
   s.add_development_dependency 'rails', '>= 3.2'
 

test/test_helper.rb

@@ -29,23 +29,29 @@
 require 'pathname'
 require 'minitest/mock'
 require 'capybara/rails'
-require 'capybara/poltergeist'
+require 'selenium/webdriver'
 Dummy::Application.load_tasks
 
 WebpackerHelpers.clear_webpacker_packs
 
 Capybara.app = Rails.application
 
-Capybara.register_driver :poltergeist_debug do |app|
-  poltergeist_options = {
-    # `page.driver.debug` will cause Poltergeist to open a browser window
-    inspector: true,
-    # hide warnings from React.js whitespace changes:
-    js_errors: false
-  }
-  Capybara::Poltergeist::Driver.new(app, poltergeist_options)
+Capybara.register_driver :chrome do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
 end
-Capybara.javascript_driver = :poltergeist_debug
+
+Capybara.register_driver :headless_chrome do |app|
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+    chromeOptions: { args: %w(headless disable-gpu) }
+  )
+
+  Capybara::Selenium::Driver.new(app,
+    browser: :chrome,
+    desired_capabilities: capabilities
+  )
+end
+
+Capybara.javascript_driver = :headless_chrome
 Capybara.current_driver = Capybara.javascript_driver
 
 CACHE_PATH = Pathname.new File.expand_path("../#{DUMMY_LOCATION}/tmp/cache", __FILE__)