[rb] default to using Options not Capabilities when not specified

Author: titusfortner

rb/lib/selenium/webdriver/chrome/driver.rb

@@ -51,7 +51,7 @@ def process_options(options, capabilities)
           if options && !options.is_a?(Options)
             raise ArgumentError, ":options must be an instance of #{Options}"
           elsif options.nil? && capabilities.nil?
-            capabilities = Remote::Capabilities.chrome
+            options = Options.new
           end
 
           super(options, capabilities)

rb/lib/selenium/webdriver/common/driver.rb

@@ -326,7 +326,7 @@ def process_options(options, capabilities)
       def generate_capabilities(capabilities)
         Array(capabilities).map { |cap|
           if cap.is_a? Symbol
-            cap = Remote::Capabilities.send(cap)
+            cap = WebDriver::Options.send(cap)
           elsif !cap.respond_to? :as_json
             msg = ":capabilities parameter only accepts objects responding to #as_json which #{cap.class} does not"
             raise ArgumentError, msg

rb/lib/selenium/webdriver/edge/driver.rb

@@ -51,7 +51,7 @@ def process_options(options, capabilities)
           if options && !options.is_a?(Options)
             raise ArgumentError, ":options must be an instance of #{Options}"
           elsif options.nil? && capabilities.nil?
-            capabilities = Remote::Capabilities.edge
+            options = Options.new
           end
 
           super(options, capabilities)

rb/lib/selenium/webdriver/firefox/driver.rb

@@ -70,7 +70,7 @@ def process_options(options, capabilities)
           if options && !options.is_a?(Options)
             raise ArgumentError, ":options must be an instance of #{Options}"
           elsif options.nil? && capabilities.nil?
-            capabilities = Remote::Capabilities.firefox
+            options = Options.new
           end
 
           super(options, capabilities)

rb/lib/selenium/webdriver/ie/driver.rb

@@ -48,7 +48,7 @@ def process_options(options, capabilities)
           if options && !options.is_a?(Options)
             raise ArgumentError, ":options must be an instance of #{Options}"
           elsif options.nil? && capabilities.nil?
-            capabilities = Remote::Capabilities.ie
+            options = Options.new
           end
 
           super(options, capabilities)

rb/lib/selenium/webdriver/safari/driver.rb

@@ -49,7 +49,7 @@ def process_options(options, capabilities)
           if options && !options.is_a?(Options)
             raise ArgumentError, ":options must be an instance of #{Options}"
           elsif options.nil? && capabilities.nil?
-            capabilities = Remote::Capabilities.safari
+            options = Options.new
           end
 
           super(options, capabilities)

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

@@ -32,7 +32,7 @@ module Chrome
         end
 
         def expect_request(body: nil, endpoint: nil)
-          body = (body || {capabilities: {alwaysMatch: {browserName: "chrome"}}}).to_json
+          body = (body || {capabilities: {alwaysMatch: {browserName: "chrome", 'goog:chromeOptions': {}}}}).to_json
           endpoint ||= "#{service_manager.uri}/session"
           stub_request(:post, endpoint).with(body: body).to_return(valid_response)
         end
@@ -70,7 +70,7 @@ def expect_request(body: nil, endpoint: nil)
 
         context 'with :capabilities' do
           it 'accepts value as a Symbol' do
-            expect_request(body: {capabilities: {alwaysMatch: {browserName: "chrome"}}})
+            expect_request
             expect { Driver.new(capabilities: :chrome) }.not_to raise_exception
           end
 

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

@@ -32,7 +32,7 @@ module Edge
         end
 
         def expect_request(body: nil, endpoint: nil)
-          body = (body || {capabilities: {alwaysMatch: {browserName: "MicrosoftEdge"}}}).to_json
+          body = (body || {capabilities: {alwaysMatch: {browserName: "MicrosoftEdge", 'ms:edgeOptions': {}}}}).to_json
           endpoint ||= "#{service_manager.uri}/session"
           stub_request(:post, endpoint).with(body: body).to_return(valid_response)
         end
@@ -75,7 +75,7 @@ def expect_request(body: nil, endpoint: nil)
 
         context 'with :capabilities' do
           it 'accepts value as a Symbol' do
-            expect_request(body: {capabilities: {alwaysMatch: {browserName: "MicrosoftEdge"}}})
+            expect_request
             expect { Driver.new(capabilities: :edge) }.not_to raise_exception
           end
 

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

@@ -32,7 +32,10 @@ module Firefox
         end
 
         def expect_request(body: nil, endpoint: nil)
-          body = (body || {capabilities: {alwaysMatch: {browserName: "firefox"}}}).to_json
+          body = (body || {capabilities: {alwaysMatch: {acceptInsecureCerts: true,
+                                                        browserName: "firefox",
+                                                        'moz:firefoxOptions': {},
+                                                        'moz:debuggerAddress': true}}}).to_json
           endpoint ||= "#{service_manager.uri}/session"
           stub_request(:post, endpoint).with(body: body).to_return(valid_response)
         end
@@ -72,7 +75,7 @@ def expect_request(body: nil, endpoint: nil)
 
         context 'with :capabilities' do
           it 'accepts value as a Symbol' do
-            expect_request(body: {capabilities: {alwaysMatch: {browserName: "firefox"}}})
+            expect_request
             expect { Driver.new(capabilities: :firefox) }.not_to raise_exception
           end
 

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

@@ -33,7 +33,7 @@ module IE
 
         def expect_request(body: nil, endpoint: nil)
           body = (body || {capabilities: {alwaysMatch: {browserName: "internet explorer",
-                                                        platformName: 'windows'}}}).to_json
+                                                        'se:ieOptions': {nativeEvents: true}}}}).to_json
           endpoint ||= "#{service_manager.uri}/session"
           stub_request(:post, endpoint).with(body: body).to_return(valid_response)
         end
@@ -74,8 +74,7 @@ def expect_request(body: nil, endpoint: nil)
 
         context 'with :capabilities' do
           it 'accepts value as a Symbol' do
-            expect_request(body: {capabilities: {alwaysMatch: {browserName: "internet explorer",
-                                                               platformName: 'windows'}}})
+            expect_request
             expect { Driver.new(capabilities: :ie) }.not_to raise_exception
           end