add default selenium chrome driver registrations

lib/capybara.rb

@@ -480,3 +480,13 @@ Capybara.register_driver :selenium do |app|
   Capybara::Selenium::Driver.new(app)
 end
 
+Capybara.register_driver :selenium_chrome do |app|
+  Capybara::Selenium::Driver.new(app, :browser => :chrome)
+end
+
+Capybara.register_driver :selenium_chrome_headless do |app|
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new()
+  browser_options.args << '--headless'
+  browser_options.args << '--disable-gpu'
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
+end

lib/capybara/selenium/driver.rb

@@ -319,7 +319,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       caps = @processed_options[:desired_capabilities]
       chrome_options = caps[:chrome_options] || caps[:chromeOptions] || {}
       args = chrome_options['args'] || chrome_options[:args] || []
-      return args.include?("headless")
+      return args.include?("--headless") || args.include?("headless")
     end
     return false
   end

spec/selenium_spec_chrome.rb

@@ -3,38 +3,34 @@ require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
 
-chrome_options = {
-  browser: :chrome,
-  options: ::Selenium::WebDriver::Chrome::Options.new(args: ENV['TRAVIS'] ? ['no-sandbox' ] : [])
-}
+CHROME_DRIVER = if ENV['CAPYBARA_CHROME_HEADLESS'] then :selenium_chrome_headless else :selenium_chrome end
 
-if ENV['CAPYBARA_CHROME_HEADLESS']
-  chrome_options[:options].args << 'headless'
-  Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta' if ENV['TRAVIS']
-end
-
-Capybara.register_driver :selenium_chrome do |app|
-  Capybara::Selenium::Driver.new(app, chrome_options)
+if ENV['CAPYBARA_CHROME_HEADLESS'] && ENV['TRAVIS']
+  Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta'
 end
 
 Capybara.register_driver :selenium_chrome_clear_storage do |app|
+  chrome_options = {
+    browser: :chrome,
+    options: ::Selenium::WebDriver::Chrome::Options.new()
+  }
+  chrome_options[:options].args << 'headless' if ENV['CAPYBARA_CHROME_HEADLESS']
   Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
 end
 
 module TestSessions
-  Chrome = Capybara::Session.new(:selenium_chrome, TestApp)
+  Chrome = Capybara::Session.new(CHROME_DRIVER, TestApp)
 end
 
 skipped_tests = [:response_headers, :status_code, :trigger]
-skipped_tests << :windows if ENV['TRAVIS'] && ENV['SKIP_WINDOW']
 # skip window tests when headless for now - closing a window not supported by chromedriver/chrome
-skipped_tests << :windows if ENV['TRAVIS'] && ENV['CAPYBARA_CHROME_HEADLESS']
+skipped_tests << :windows if ENV['TRAVIS']  && (ENV['SKIP_WINDOW'] || ENV['CAPYBARA_CHROME_HEADLESS'])
 
-Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: skipped_tests
+Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with chrome" do
   include Capybara::SpecHelper
-  include_examples  "Capybara::Session", TestSessions::Chrome, :selenium_chrome
+  include_examples  "Capybara::Session", TestSessions::Chrome, CHROME_DRIVER
 
   context "storage" do
     describe "#reset!" do