[rb] allow Options#add_option to accept a Hash as well as ordered pairs

Author: titusfortner

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

@@ -90,7 +90,8 @@ def initialize(options: nil, **opts)
       # @param [Boolean, String, Integer] value Value of the option
       #
 
-      def add_option(name, value)
+      def add_option(name, value = nil)
+        @options[name.keys.first] = name.values.first if value.nil? && name.is_a?(Hash)
         @options[name] = value
       end
 

rb/lib/selenium/webdriver/safari/options.rb

@@ -28,8 +28,9 @@ class Options < WebDriver::Options
                         automatic_profiling: 'safari:automaticProfiling'}.freeze
         BROWSER = 'safari'
 
-        def add_option(name, value)
-          raise ArgumentError, 'Safari does not support options that are not namespaced' unless name.to_s.include?(':')
+        def add_option(name, value = nil)
+          key = name.is_a?(Hash) ? name.keys.first : name
+          raise ArgumentError, 'Safari does not support options that are not namespaced' unless key.to_s.include?(':')
 
           super
         end

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

@@ -177,10 +177,15 @@ module Chrome
         end
 
         describe '#add_option' do
-          it 'adds an option' do
+          it 'adds an option with ordered pairs' do
             options.add_option(:foo, 'bar')
             expect(options.instance_variable_get('@options')[:foo]).to eq('bar')
           end
+
+          it 'adds an option with Hash' do
+            options.add_option(foo: 'bar')
+            expect(options.instance_variable_get('@options')[:foo]).to eq('bar')
+          end
         end
 
         describe '#add_preference' do

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

@@ -133,10 +133,15 @@ module Edge
         end
 
         describe '#add_option' do
-          it 'adds an option' do
+          it 'adds an option with ordered pairs' do
             options.add_option(:foo, 'bar')
             expect(options.instance_variable_get('@options')[:foo]).to eq('bar')
           end
+
+          it 'adds an option with Hash' do
+            options.add_option(foo: 'bar')
+            expect(options.instance_variable_get('@options')[:foo]).to eq('bar')
+          end
         end
 
         describe '#add_preference' do

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

@@ -125,10 +125,15 @@ module Firefox
         end
 
         describe '#add_option' do
-          it 'adds an option' do
+          it 'adds an option with ordered pairs' do
             options.add_option(:foo, 'bar')
             expect(options.instance_variable_get('@options')[:foo]).to eq('bar')
           end
+
+          it 'adds an option with Hash' do
+            options.add_option(foo: 'bar')
+            expect(options.instance_variable_get('@options')[:foo]).to eq('bar')
+          end
         end
 
         describe '#add_preference' do

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

@@ -102,9 +102,14 @@ module IE
         end
 
         describe '#add_option' do
-          it 'adds an option' do
+          it 'adds an option with ordered pairs' do
             options.add_option(:foo, 'bar')
-            expect(options.options[:foo]).to eq('bar')
+            expect(options.instance_variable_get('@options')[:foo]).to eq('bar')
+          end
+
+          it 'adds an option with Hash' do
+            options.add_option(foo: 'bar')
+            expect(options.instance_variable_get('@options')[:foo]).to eq('bar')
           end
         end
 

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

@@ -59,15 +59,26 @@ module Safari
         end
 
         describe '#add_option' do
-          it 'adds an option if name spaced' do
-            options.add_option('safari:foo', 'bar')
-            expect(options.instance_variable_get('@options')['safari:foo']).to eq('bar')
+          context 'when namespaced' do
+            it 'adds an option with ordered pairs' do
+              options.add_option('safari:foo', 'bar')
+              expect(options.instance_variable_get('@options')['safari:foo']).to eq('bar')
+            end
+
+            it 'adds an option with Hash' do
+              options.add_option('safari:foo': 'bar')
+              expect(options.instance_variable_get('@options')[:'safari:foo']).to eq('bar')
+            end
           end
 
-          # Note that this only applies to the method, weird things can still happen
-          # if stuff is passed into the constructor
-          it 'raises exception if not name spaced' do
-            expect { options.add_option('foo', 'bar') }.to raise_exception(ArgumentError)
+          context 'when not namespaced' do
+            it 'raises exception with ordered pairs' do
+              expect { options.add_option('foo', 'bar') }.to raise_exception(ArgumentError)
+            end
+
+            it 'raises exception with Hash' do
+              expect { options.add_option(foo: 'bar') }.to raise_exception(ArgumentError)
+            end
           end
         end