Remove no longer necessary options and add W3C mode tests for chromedriver

.travis.yml

@@ -86,9 +86,13 @@ matrix:
       env: CAPYBARA_FF=true HEADLESS=true
       addons:
         firefox: latest
+    - gemfile: Gemfile
+      rvm: 2.5.1
+      env: W3C=true HEADLESS=true
   allow_failures:
     - gemfile: gemfiles/Gemfile.beta-versions
     - gemfile: gemfiles/Gemfile.edge-marionette
+    - env: W3C=true HEADLESS=true
 before_install:
   - gem update --system
   - gem install bundler -v 1.16.2

spec/selenium_spec_chrome.rb

@@ -7,10 +7,6 @@ require 'rspec/shared_spec_matchers'
 
 CHROME_DRIVER = ENV['HEADLESS'] ? :selenium_chrome_headless : :selenium_chrome
 
-# if ENV['HEADLESS'] && ENV['TRAVIS']
-#   Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta'
-# end
-
 Capybara.register_driver :selenium_chrome do |app|
   driver = Capybara::Selenium::Driver.new(app, browser: :chrome)
   driver.browser.download_path = Capybara.save_path
@@ -19,8 +15,8 @@ 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' if Gem.win_platform?
+  browser_options.headless!
+  browser_options.add_option(:w3c, !!ENV['W3C'])
   driver = Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
   driver.browser.download_path = Capybara.save_path
   driver
@@ -31,7 +27,7 @@ Capybara.register_driver :selenium_chrome_clear_storage do |app|
     browser: :chrome,
     options: ::Selenium::WebDriver::Chrome::Options.new
   }
-  chrome_options[:options].args << 'headless' if ENV['HEADLESS']
+  chrome_options[:options].headless! if ENV['HEADLESS']
   Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
 end
 

spec/selenium_spec_marionette.rb

@@ -6,8 +6,7 @@ require 'shared_selenium_session'
 require 'rspec/shared_spec_matchers'
 
 browser_options = ::Selenium::WebDriver::Firefox::Options.new
-browser_options.args << '--headless' if ENV['HEADLESS']
-browser_options.add_preference 'dom.file.createInChild', true
+browser_options.headless! if ENV['HEADLESS']
 # browser_options.add_option("log", {"level": "trace"})
 
 browser_options.profile = Selenium::WebDriver::Firefox::Profile.new.tap do |profile|
@@ -21,7 +20,6 @@ Capybara.register_driver :selenium_marionette do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: { marionette: true, 'moz:webdriverClick': true },
     options: browser_options,
     # Get a trace level log from geckodriver
     # :driver_opts => { args: ['-vv'] }
@@ -32,7 +30,6 @@ Capybara.register_driver :selenium_marionette_clear_storage do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: { marionette: true },
     clear_local_storage: true,
     clear_session_storage: true,
     options: browser_options