[rb] fix parsing differences between options and capabilities

Author: titusfortner

rb/lib/selenium/webdriver/common/options.rb

@@ -109,8 +109,7 @@ def ==(other)
       def as_json(*)
         options = @options.dup
 
-        w3c_options = options.select { |key, _val| W3C_OPTIONS.include?(key) }
-        options.delete_if { |key, _val| W3C_OPTIONS.include?(key) }
+        w3c_options = process_w3c_options(options)
 
         self.class::CAPABILITIES.each do |capability_alias, capability_name|
           capability_value = options.delete(capability_alias)
@@ -124,6 +123,13 @@ def as_json(*)
 
       private
 
+      def process_w3c_options(options)
+        w3c_options = options.select { |key, _val| W3C_OPTIONS.include?(key) }
+        w3c_options[:unhandled_prompt_behavior] &&= w3c_options[:unhandled_prompt_behavior]&.to_s&.tr('_', ' ')
+        options.delete_if { |key, _val| W3C_OPTIONS.include?(key) }
+        w3c_options
+      end
+
       def process_browser_options(_browser_options)
         nil
       end

rb/lib/selenium/webdriver/common/proxy.rb

@@ -141,10 +141,10 @@ def type=(type)
 
       def as_json(*)
         json_result = {
-          'proxyType' => TYPES[type],
+          'proxyType' => TYPES[type].downcase,
           'ftpProxy' => ftp,
           'httpProxy' => http,
-          'noProxy' => no_proxy,
+          'noProxy' => no_proxy.is_a?(String) ? no_proxy.split(', ') : no_proxy,
           'proxyAutoconfigUrl' => pac,
           'sslProxy' => ssl,
           'autodetect' => auto_detect,

rb/lib/selenium/webdriver/remote/capabilities.rb

@@ -307,23 +307,13 @@ def convert_value(key, value)
           when :platform
             value.to_s.upcase
           when :proxy
-            convert_proxy(value)
+            value&.as_json
           when :unhandled_prompt_behavior
             value.is_a?(Symbol) ? value.to_s.tr('_', ' ') : value
           else
             value
           end
         end
-
-        def convert_proxy(value)
-          return unless value
-
-          hash = value.as_json
-          hash['proxyType'] &&= hash['proxyType'].downcase
-          hash['noProxy'] = hash['noProxy'].split(', ') if hash['noProxy'].is_a?(String)
-
-          hash
-        end
       end # Capabilities
     end # Remote
   end # WebDriver

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

@@ -235,8 +235,8 @@ module Chrome
             opts = Options.new(browser_version: '75',
                                platform_name: 'win10',
                                accept_insecure_certs: false,
-                               page_load_strategy: 'eager',
-                               unhandled_prompt_behavior: 'accept',
+                               page_load_strategy: :eager,
+                               unhandled_prompt_behavior: :accept_and_notify,
                                strict_file_interactability: true,
                                timeouts: {script: 40000,
                                           page_load: 400000,
@@ -268,7 +268,7 @@ module Chrome
                                        'platformName' => 'win10',
                                        'acceptInsecureCerts' => false,
                                        'pageLoadStrategy' => 'eager',
-                                       'unhandledPromptBehavior' => 'accept',
+                                       'unhandledPromptBehavior' => 'accept and notify',
                                        'strictFileInteractability' => true,
                                        'timeouts' => {'script' => 40000,
                                                       'pageLoad' => 400000,

rb/spec/unit/selenium/webdriver/proxy_spec.rb

@@ -70,10 +70,10 @@ module WebDriver
       it 'should return a hash of the json properties to serialize', :aggregate_failures do
         proxy_json = Proxy.new(proxy_settings).as_json
 
-        expect(proxy_json['proxyType']).to     eq('MANUAL')
+        expect(proxy_json['proxyType']).to     eq('manual')
         expect(proxy_json['ftpProxy']).to      eq(proxy_settings[:ftp])
         expect(proxy_json['httpProxy']).to     eq(proxy_settings[:http])
-        expect(proxy_json['noProxy']).to       eq(proxy_settings[:no_proxy])
+        expect(proxy_json['noProxy']).to       eq([proxy_settings[:no_proxy]])
         expect(proxy_json['sslProxy']).to      eq(proxy_settings[:ssl])
         expect(proxy_json['socksProxy']).to    eq(proxy_settings[:socks])
         expect(proxy_json['socksUsername']).to eq(proxy_settings[:socks_username])
@@ -84,14 +84,14 @@ module WebDriver
       it 'should configure a PAC proxy', :aggregate_failures do
         proxy_json = Proxy.new(pac_proxy_settings).as_json
 
-        expect(proxy_json['proxyType']).to eq('PAC')
+        expect(proxy_json['proxyType']).to eq('pac')
         expect(proxy_json['proxyAutoconfigUrl']).to eq(pac_proxy_settings[:pac])
       end
 
       it 'should configure an auto-detected proxy', :aggregate_failures do
         proxy_json = Proxy.new(auto_detect: true).as_json
 
-        expect(proxy_json['proxyType']).to eq('AUTODETECT')
+        expect(proxy_json['proxyType']).to eq('autodetect')
         expect(proxy_json['autodetect']).to be true
       end
 
@@ -101,7 +101,7 @@ module WebDriver
         proxy = Proxy.new(settings)
         proxy_json = proxy.as_json
 
-        expect(proxy_json.delete('proxyType')).to eq(settings[:type].to_s.upcase)
+        expect(proxy_json.delete('proxyType')).to eq(settings[:type].to_s)
         expect(proxy_json.delete('httpProxy')).to eq(settings[:http])
 
         expect(proxy_json).to be_empty