[rb] fix bug with values nested inside chrome prefs getting camelcased

SeleniumHQ · Mar 24, 2021 · eebed33 · eebed33
1 parent 84dd610
commit eebed33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/rb/lib/selenium/webdriver/common/options.rb b/rb/lib/selenium/webdriver/common/options.rb
@@ -137,8 +137,9 @@ def generate_as_json(value, camelize_keys: true)
           value.each_with_object({}) do |(key, val), hash|
             next if val.respond_to?(:empty?) && val.empty?
 
-            key = convert_json_key(key, camelize: camelize_keys)
-            hash[key] = generate_as_json(val, camelize_keys: camelize?(key))
+            camelize = camelize_keys ? camelize?(key) : false
+            key = convert_json_key(key, camelize: camelize)
+            hash[key] = generate_as_json(val, camelize_keys: camelize)
           end
         elsif value.respond_to?(:as_json)
           value.as_json

diff --git a/rb/spec/unit/selenium/webdriver/chrome/options_spec.rb b/rb/spec/unit/selenium/webdriver/chrome/options_spec.rb
@@ -234,7 +234,8 @@ module Chrome
                                set_window_rect: false,
                                args: %w[foo bar],
                                prefs: {foo: 'bar',
-                                       key_that_should_not_be_camelcased: 'baz'},
+                                       key_that_should_not_be_camelcased: 'baz',
+                                       nested_one: {nested_two: 'bazbar'}},
                                binary: '/foo/bar',
                                extensions: ['foo.crx', 'bar.crx'],
                                encoded_extensions: ['encoded_foobar'],
@@ -262,7 +263,8 @@ module Chrome
                                        'setWindowRect' => false,
                                        key => {'args' => %w[foo bar],
                                                'prefs' => {'foo' => 'bar',
-                                                           'key_that_should_not_be_camelcased' => 'baz'},
+                                                           'key_that_should_not_be_camelcased' => 'baz',
+                                                           'nested_one' => {'nested_two' => 'bazbar'}},
                                                'binary' => '/foo/bar',
                                                'extensions' => %w[encoded_foobar encoded_foo encoded_bar],
                                                'foo' => 'bar',