selenium-webdriver 3.4.1 → 3.4.2

data/CHANGES

@@ -1,3 +1,18 @@
+3.4.2 (2017-06-14)
+==================
+
+Ruby:
+  * Added unhandledPromptBehavior to the list of known capabilities.
+  * Added timeouts to the list of known capabilities.
+  * Fixed a regression when passing hash as :desired_capabilities caused NoMethodError (issue 4172, thanks Thomas Walpole).
+  * Fixed a regression when extension capabilities (the ones that have ":" inside)
+    were filtered out when doing protocol handshake.
+  * Improved handling of capability names passed as plain camelCased strings
+    vs Rubyish snake_cased symbols when doing protocol handshake.
+
+Chrome:
+  * Fixed a regression when passing :switches to driver initialization was ignored.
+
 3.4.1 (2017-06-13)
 ==================
 

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

@@ -74,9 +74,9 @@ module Selenium
           caps = opts.delete(:desired_capabilities) { Remote::Capabilities.chrome }
           options = opts.delete(:options) { Options.new }
 
-          args = opts.delete(:args)
+          args = opts.delete(:args) || opts.delete(:switches)
           if args
-            WebDriver.logger.deprecate ':args', 'Selenium::WebDriver::Chrome::Options#add_argument'
+            WebDriver.logger.deprecate ':args or :switches', 'Selenium::WebDriver::Chrome::Options#add_argument'
             raise ArgumentError, ':args must be an Array of Strings' unless args.is_a? Array
             args.each { |arg| options.add_argument(arg.to_s) }
           end

data/lib/selenium/webdriver/remote/bridge.rb

@@ -92,7 +92,7 @@ module Selenium
         #
 
         def create_session(desired_capabilities)
-          response = execute(:new_session, {}, merged_capabilties(desired_capabilities))
+          response = execute(:new_session, {}, merged_capabilities(desired_capabilities))
 
           @session_id = response['sessionId']
           oss_status = response['status']
@@ -171,13 +171,13 @@ module Selenium
           COMMANDS[command]
         end
 
-        def merged_capabilties(oss_capabilities)
-          w3c_capabilties = W3C::Capabilities.from_oss(oss_capabilities)
+        def merged_capabilities(oss_capabilities)
+          w3c_capabilities = W3C::Capabilities.from_oss(oss_capabilities)
 
           {
             desiredCapabilities: oss_capabilities,
             capabilities: {
-              firstMatch: [w3c_capabilties]
+              firstMatch: [w3c_capabilities]
             }
           }
         end

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

@@ -39,6 +39,8 @@ module Selenium
         # https://bugzilla.mozilla.org/show_bug.cgi?id=1326397
         class Capabilities
 
+          EXTENSION_CAPABILITY_PATTERN = /\A[\w-]+:.*\z/
+
           # TODO (alex): compare with spec
           KNOWN = [
             :browser_name,
@@ -54,10 +56,10 @@ module Selenium
             :implicit_timeout,
             :page_load_timeout,
             :script_timeout,
+            :unhandled_prompt_behavior,
+            :timeouts,
           ].freeze
 
-          BROWSER_SPECIFIC = ['moz:firefoxOptions'].freeze
-
           KNOWN.each do |key|
             define_method key do
               @capabilities.fetch(key)
@@ -140,26 +142,30 @@ module Selenium
 
             #
             # Creates W3C compliant capabilities from OSS ones.
-            # @param [Remote::Capabilities]
+            # @param [Hash, Remote::Capabilities]
             #
 
-            def from_oss(capabilities)
-              w3c_capabilties = new
+            def from_oss(oss_capabilities)
+              w3c_capabilities = new
+
               # TODO (alex): make capabilities enumerable?
-              oss_capabilties = capabilities.__send__(:capabilities)
-              oss_capabilties.each do |name, value|
+              oss_capabilities = oss_capabilities.__send__(:capabilities) unless oss_capabilities.is_a?(Hash)
+              oss_capabilities.each do |name, value|
                 next if value.nil?
                 next if value.is_a?(String) && value.empty?
 
-                if w3c_capabilties.respond_to?("#{name}=")
-                  w3c_capabilties.__send__("#{name}=", value)
-                elsif BROWSER_SPECIFIC.include?(name)
-                  w3c_capabilties.merge!(name => value)
-                end
+                capability_name = name.to_s
+                snake_cased_capability_names = KNOWN.map(&:to_s)
+                camel_cased_capability_names = snake_cased_capability_names.map(&w3c_capabilities.method(:camel_case))
+
+                next unless snake_cased_capability_names.include?(capability_name) ||
+                            camel_cased_capability_names.include?(capability_name) ||
+                            capability_name.match(EXTENSION_CAPABILITY_PATTERN)
 
+                w3c_capabilities[name] = value
               end
 
-              w3c_capabilties
+              w3c_capabilities
             end
           end
 

data/selenium-webdriver.gemspec

@@ -5,7 +5,7 @@ raise "cwd must be #{root} when reading gemspec" if root != Dir.pwd
 
 Gem::Specification.new do |s|
   s.name = 'selenium-webdriver'
-  s.version = '3.4.1'
+  s.version = '3.4.2'
 
   s.authors = ['Alex Rodionov', 'Titus Fortner']
   s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com']

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors: 
   - Alex Rodionov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2017-06-13 00:00:00 +07:00
+date: 2017-06-15 00:00:00 +07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -96,7 +96,6 @@ extra_rdoc_files: []
 files: 
   - CHANGES
   - Gemfile
-  - Gemfile.lock
   - LICENSE
   - README.md
   - selenium-webdriver.gemspec

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    selenium-webdriver (3.4.1)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    childprocess (0.7.0)
-      ffi (~> 1.0, >= 1.0.11)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    ffi (1.9.18)
-    hashdiff (0.3.4)
-    public_suffix (2.0.5)
-    rack (1.6.8)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubyzip (1.2.1)
-    safe_yaml (1.0.4)
-    webmock (2.3.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rack (~> 1.0)
-  rspec (~> 3.0)
-  selenium-webdriver!
-  webmock (~> 2.0)
-  yard (~> 0.8.7)
-
-BUNDLED WITH
-   1.15.1