[rb] fix bugs to get specs to pass

quehanwei · Nov 28, 2019 · 2f8943e · 2f8943e
1 parent be1975e
commit 2f8943e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/rb/lib/selenium/webdriver/common/driver.rb b/rb/lib/selenium/webdriver/common/driver.rb
@@ -276,7 +276,7 @@ def [](sel)
       end
 
       def browser
-        bridge.browser
+        bridge&.browser
       end
 
       def capabilities
@@ -297,12 +297,12 @@ def ref; end
       def create_bridge(**opts)
         opts[:url] ||= service_url(opts)
 
-        default_caps = @bridge&.browser || :new
-        desired_capabilities = opts.delete(:desired_capabilities) || Remote::Capabilities.send(default_caps)
-
+        desired_capabilities = opts.delete(:desired_capabilities) || Remote::Capabilities.send(browser || :new)
         options = opts.delete(:options)
 
-        bridge = Remote::Bridge.new(opts)
+        bridge = Remote::Bridge.new(http_client: opts.delete(:http_client), url: opts.delete(:url))
+        raise ArgumentError, "Unable to create a driver with parameters: #{opts}" unless opts.empty?
+
         namespacing = self.class.to_s.split('::')
 
         if Object.const_defined?("#{namespacing[0..-2].join('::')}::Bridge") && !namespacing.include?('Remote')

diff --git a/rb/lib/selenium/webdriver/remote/capabilities.rb b/rb/lib/selenium/webdriver/remote/capabilities.rb
@@ -105,6 +105,7 @@ def firefox(opts = {})
             opts[:timeouts]['implicit'] = opts.delete(:implicit_timeout) if opts.key?(:implicit_timeout)
             opts[:timeouts]['pageLoad'] = opts.delete(:page_load_timeout) if opts.key?(:page_load_timeout)
             opts[:timeouts]['script'] = opts.delete(:script_timeout) if opts.key?(:script_timeout)
+            opts.delete(:timeouts) if opts[:timeouts].empty?
             new({browser_name: 'firefox'}.merge(opts))
           end