[rb] move w3c checks to Options class

Author: titusfortner

rb/lib/selenium/webdriver/chrome/options.rb

@@ -227,6 +227,9 @@ def process_browser_options(browser_options)
 
           options = browser_options[self.class::KEY]
           options['binary'] ||= binary_path if binary_path
+
+          check_w3c(options[:w3c]) if options.key?(:w3c)
+
           if @profile
             options['args'] ||= []
             options['args'] << "--user-data-dir=#{@profile.directory}"
@@ -237,6 +240,17 @@ def process_browser_options(browser_options)
           options['extensions'] = @encoded_extensions + @extensions.map { |ext| encode_extension(ext) }
         end
 
+        def check_w3c(w3c)
+          if w3c
+            WebDriver.logger.warn("Setting 'w3c: true' is redundant and will no longer be allowed", id: :w3c)
+            return
+          end
+
+          raise Error::InvalidArgumentError,
+                "Setting 'w3c: false' is not allowed.\n" \
+                "Please update to W3C Syntax: https://www.selenium.dev/blog/2022/legacy-protocol-support/"
+        end
+
         def binary_path
           Chrome.path
         end

rb/lib/selenium/webdriver/remote/bridge.rb

@@ -49,7 +49,6 @@ def initialize(url:, http_client: nil)
         #
 
         def create_session(capabilities)
-          check_chrome_w3c_false(capabilities)
           response = execute(:new_session, {}, prepare_capabilities_payload(capabilities))
 
           @session_id = response['sessionId']
@@ -667,27 +666,6 @@ def escape_css(string)
 
           string
         end
-
-        #
-        # Checks if w3c key is set to false and raises error for the same.
-        #
-        def check_chrome_w3c_false(capabilities)
-          return unless capabilities['browserName'] == 'chrome' && capabilities.key?('goog:chromeOptions')
-
-          capability = capabilities['goog:chromeOptions']
-          w3c = true
-
-          if capability.instance_of?(Hash)
-            raw_w3c = capability['w3c']
-            w3c = raw_w3c.nil? || raw_w3c
-          end
-
-          return if w3c
-
-          raise Error::WebDriverError, "Setting 'w3c: false' is not allowed.\n"\
-                                       "Please update to W3C Syntax: https://www"\
-                                       ".selenium.dev/blog/2022/legacy-protocol-support/"
-        end
       end # Bridge
     end # Remote
   end # WebDriver

rb/spec/integration/selenium/webdriver/driver_spec.rb

@@ -39,11 +39,6 @@ module WebDriver
         end
       end
 
-      it 'should raise error when w3c is false', exclusive: {browser: %i[chrome]} do
-        options = Selenium::WebDriver::Chrome::Options.new(w3c: false)
-        expect { Selenium::WebDriver.for :chrome, capabilities: options }.to raise_error(Error::WebDriverError)
-      end
-
       it 'should get driver status' do
         status = driver.status
         expect(status).to include('ready', 'message')

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

@@ -247,6 +247,17 @@ module Chrome
             expect(options.as_json).to eq("browserName" => "chrome", "goog:chromeOptions" => {})
           end
 
+          it 'should raise error when w3c is false' do
+            options.add_option(:w3c, false)
+            expect { options.as_json }.to raise_error(Error::InvalidArgumentError)
+          end
+
+          it 'should raise error when w3c is true' do
+            msg = /WARN Selenium \[:w3c\]/
+            options.add_option(:w3c, true)
+            expect { options.as_json }.to output(msg).to_stdout_from_any_process
+          end
+
           it 'returns added options' do
             options.add_option(:foo, 'bar')
             options.add_option('foo:bar', {foo: 'bar'})

rb/spec/unit/selenium/webdriver/edge/options_spec.rb

@@ -203,6 +203,17 @@ module Edge
             expect(options.as_json).to eq("browserName" => "MicrosoftEdge", "ms:edgeOptions" => {})
           end
 
+          it 'should raise error when w3c is false' do
+            options.add_option(:w3c, false)
+            expect { options.as_json }.to raise_error(Error::InvalidArgumentError)
+          end
+
+          it 'should raise error when w3c is true' do
+            msg = /WARN Selenium \[:w3c\]/
+            options.add_option(:w3c, true)
+            expect { options.as_json }.to output(msg).to_stdout_from_any_process
+          end
+
           it 'returns added options' do
             options.add_option(:foo, 'bar')
             options.add_option('foo:bar', {foo: 'bar'})