Update specs for W3C-capable Chrome

Author: p0deje

rb/spec/integration/selenium/webdriver/action_builder_spec.rb

@@ -150,7 +150,7 @@ module WebDriver
           expect(text).to eq('Dropped!')
         end
 
-        it 'double clicks an element' do
+        it 'double clicks an element', except: {browser: :chrome} do
           driver.navigate.to url_for('javascriptPage.html')
           element = driver.find_element(id: 'doubleClickField')
 

rb/spec/integration/selenium/webdriver/chrome/options_spec.rb

@@ -22,7 +22,7 @@
 module Selenium
   module WebDriver
     module Chrome
-      describe Options, only: {driver: :chrome} do
+      describe Options, only: {browser: :chrome} do
         subject(:options) { described_class.new }
 
         it 'passes emulated device correctly' do

rb/spec/integration/selenium/webdriver/manage_spec.rb

@@ -22,7 +22,7 @@
 module Selenium
   module WebDriver
     describe Manager do
-      describe 'logs', only: {browser: %i[chrome]} do
+      describe 'logs', except: {browser: %i[chrome firefox ie safari safari_preview]} do
         it 'can fetch remote log types', only: {driver: :remote} do
           expect(driver.manage.logs.available_types).to include(:server, :browser, :driver)
         end

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

@@ -209,6 +209,12 @@ def create_remote_driver(opt = {})
           opt[:url] ||= ENV['WD_REMOTE_URL'] || remote_server.webdriver_url
           opt[:http_client] ||= keep_alive_client || http_client
 
+          # https://bugs.chromium.org/p/chromedriver/issues/detail?id=2536
+          # Current status can be found here (70% as of February 2019)
+          # https://chromium.googlesource.com/chromium/src/+/master/docs/chromedriver_status.md
+          # TODO: remove before Selenium 4 release
+          opt[:options] ||= WebDriver::Chrome::Options.new(options: {w3c: true}) if browser == :chrome
+
           WebDriver::Driver.for(:remote, opt)
         end
 
@@ -235,7 +241,11 @@ def create_chrome_driver(opt = {})
           # Current status can be found here (70% as of February 2019)
           # https://chromium.googlesource.com/chromium/src/+/master/docs/chromedriver_status.md
           # TODO: remove before Selenium 4 release
-          opt[:options] = WebDriver::Chrome::Options.new(options: {w3c: true}) unless opt[:options]
+          if opt[:options]
+            opt[:options].add_option(:w3c, true)
+          else
+            opt[:options] = WebDriver::Chrome::Options.new(options: {w3c: true})
+          end
 
           WebDriver::Driver.for :chrome, opt
         end

rb/spec/integration/selenium/webdriver/window_spec.rb

@@ -75,7 +75,7 @@ module WebDriver
         expect(new_pos.y).to eq(target_y)
       end
 
-      it 'gets the rect of the current window', only: {browser: %i[firefox ie]} do
+      it 'gets the rect of the current window', only: {browser: %i[firefox ie chrome]} do
         rect = window.rect
 
         expect(rect).to be_a(Rectangle)
@@ -86,7 +86,7 @@ module WebDriver
         expect(rect.height).to be >= 0
       end
 
-      it 'sets the rect of the current window', only: {browser: %i[firefox ie]} do
+      it 'sets the rect of the current window', only: {browser: %i[firefox ie chrome]} do
         rect = window.rect
 
         target_x = rect.x + 10
@@ -118,7 +118,7 @@ module WebDriver
 
       # Edge: Not Yet - https://dev.windows.com/en-us/microsoft-edge/platform/status/webdriver/details/
       # https://github.com/mozilla/geckodriver/issues/1281
-      it 'can make window full screen', only: {window_manager: true, browser: %i[ie firefox]},
+      it 'can make window full screen', only: {window_manager: true, browser: %i[chrome ie firefox]},
                                         exclude: {driver: :remote, browser: :firefox, platform: :linux} do
         window.size = old_size = Dimension.new(200, 200)