selenium-webdriver 3.142.6 → 3.142.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c1b3f97015a3b8008f3b29bfd6bad97ba2f065c
-  data.tar.gz: 138f7b9090ceb5dbae76174d7e5778edd35a8abe
+  metadata.gz: c9f40e154da198fff9e277f0613042c22fff6c98
+  data.tar.gz: 33cc734e78b08e66c00a4c73f51c635d97c86fe6
 SHA512:
-  metadata.gz: d37493473105357942a2e73dd137b5dd13d747a85982217f4296110c961a0b6197a194084766de856d08bb78f2608ac66043b4220c4a1b0673fb75c7cb9f0f38
-  data.tar.gz: d61d39b2060c5da80669c72e21e65ef8f6d4c052967289cded7f84ff7f70bd6817da268496909f17abb0e5ddc04c0be55c25a45f0de2e7480dc9fcd3e77b1581
+  metadata.gz: b40eb2e74a284b21ee31924f7cf20b878c7ab6ebcfe7848b21ad163165c80467c9d3a6fa6252ca74680b82db7186e8c1b73a2ac5f4d37501b0dfa16763ec19b9
+  data.tar.gz: bc9e9e0128888f3efe33f59160b677cc88655bf986877c534053adf915f3b39a78ff1d88e9b2d80753c1aba49af92f1796bb4f774ca68114027594813cc26ad3

data/CHANGES

@@ -1,3 +1,9 @@
+3.142.7 (2019-12-27)
+====================
+
+Ruby:
+  * Fix keyword argument deprecations in Ruby 2.7 (thanks @connorshea)
+
 3.142.6 (2019-10-04)
 ====================
 

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

@@ -40,7 +40,7 @@ module Selenium
           opts[:url] ||= service_url(opts)
 
           listener = opts.delete(:listener)
-          @bridge = Remote::Bridge.handshake(opts)
+          @bridge = Remote::Bridge.handshake(**opts)
           @bridge.extend Bridge
 
           super(@bridge, listener: listener)
@@ -76,21 +76,29 @@ module Selenium
 
           profile = opts.delete(:profile)
           if profile
+            WebDriver.logger.deprecate 'Selenium::WebDriver::Chrome::Driver#new with `:profile` parameter',
+                                       'Selenium::WebDriver::Chrome::Options#profile or Options#add_option'
+
             profile = profile.as_json
 
-            options.add_argument("--user-data-dir=#{profile[:directory]}") if options.args.none? { |arg| arg =~ /user-data-dir/ }
+            if options.args.none?(&/user-data-dir/.method(:match?))
+              options.add_argument("--user-data-dir=#{profile['directory']}")
+            end
 
-            if profile[:extensions]
-              WebDriver.logger.deprecate 'Using Selenium::WebDriver::Chrome::Profile#extensions',
+            if profile['extensions']
+              WebDriver.logger.deprecate 'Selenium::WebDriver::Chrome::Profile#extensions',
                                          'Selenium::WebDriver::Chrome::Options#add_extension'
-              profile[:extensions].each do |extension|
+              profile['extensions'].each do |extension|
                 options.add_encoded_extension(extension)
               end
             end
           end
 
-          detach = opts.delete(:detach)
-          options.add_option(:detach, true) if detach
+          if opts.key?(:detach)
+            WebDriver.logger.deprecate 'Selenium::WebDriver::Chrome::Driver#new with `:detach` parameter',
+                                       'Selenium::WebDriver::Chrome::Options#new or Options#add_option'
+            options.add_option(:detach, opts.delete(:detach))
+          end
 
           prefs = opts.delete(:prefs)
           if prefs
@@ -103,8 +111,13 @@ module Selenium
           options = options.as_json
           caps.merge!(options) unless options[Options::KEY].empty?
 
-          caps[:proxy] = opts.delete(:proxy) if opts.key?(:proxy)
-          caps[:proxy] ||= opts.delete('proxy') if opts.key?('proxy')
+          if opts.key?(:proxy) || opts.key?('proxy')
+            WebDriver.logger.deprecate 'Selenium::WebDriver::Chrome::Driver#new with `:proxy` parameter',
+                                       'Selenium::WebDriver::Chrome::Capabilities#proxy='
+
+            caps[:proxy] = opts.delete(:proxy) if opts.key?(:proxy)
+            caps[:proxy] ||= opts.delete('proxy') if opts.key?('proxy')
+          end
 
           caps
         end

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

@@ -20,9 +20,9 @@
 module Selenium
   module WebDriver
     module Chrome
-      class Options
+      class Options < WebDriver::Common::Options
         attr_reader :args, :prefs, :options, :emulation, :extensions, :encoded_extensions
-        attr_accessor :binary
+        attr_accessor :binary, :profile, :detach
 
         KEY = 'goog:chromeOptions'
 
@@ -49,6 +49,8 @@ module Selenium
           @extensions = opts.delete(:extensions) || []
           @options = opts.delete(:options) || {}
           @emulation = opts.delete(:emulation) || {}
+          @detach = opts.delete(:detach)
+          @profile = opts.delete(:profile)
           @encoded_extensions = []
         end
 
@@ -170,6 +172,7 @@ module Selenium
             File.open(crx_path, 'rb') { |crx_file| Base64.strict_encode64 crx_file.read }
           end
           extensions.concat(@encoded_extensions)
+          add_argument("--user-data-dir=#{@profile[:directory]}") if @profile
 
           opts = @options
           opts[:binary] = @binary if @binary
@@ -177,8 +180,9 @@ module Selenium
           opts[:extensions] = extensions if extensions.any?
           opts[:mobileEmulation] = @emulation unless @emulation.empty?
           opts[:prefs] = @prefs unless @prefs.empty?
+          opts[:detach] = @detach if !@detach.nil? && @detach != false
 
-          {KEY => opts}
+          {KEY => generate_as_json(opts)}
         end
       end # Options
     end # Chrome

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

@@ -77,8 +77,8 @@ module Selenium
 
           extensions.concat(@encoded_extensions)
 
-          opts = {directory: directory || layout_on_disk}
-          opts[:extensions] = extensions if extensions.any?
+          opts = {'directory' => directory || layout_on_disk}
+          opts['extensions'] = extensions if extensions.any?
           opts
         end
 

data/lib/selenium/webdriver/common.rb

@@ -72,5 +72,6 @@ require 'selenium/webdriver/common/interactions/pointer_input'
 require 'selenium/webdriver/common/keys'
 require 'selenium/webdriver/common/bridge_helper'
 require 'selenium/webdriver/common/profile_helper'
+require 'selenium/webdriver/common/options'
 require 'selenium/webdriver/common/driver'
 require 'selenium/webdriver/common/element'

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    module Common
+      class Options
+        private
+
+        def generate_as_json(value)
+          if value.respond_to?(:as_json)
+            value.as_json
+          elsif value.is_a?(Hash)
+            value.each_with_object({}) { |(key, val), hash| hash[convert_json_key(key)] = generate_as_json(val) }
+          elsif value.is_a?(Array)
+            value.map(&method(:generate_as_json))
+          elsif value.is_a?(Symbol)
+            value.to_s
+          else
+            value
+          end
+        end
+
+        def convert_json_key(key)
+          key = camel_case(key) if key.is_a?(Symbol)
+          return key if key.is_a?(String)
+
+          raise TypeError, "expected String or Symbol, got #{key.inspect}:#{key.class}"
+        end
+
+        def camel_case(str)
+          str.to_s.gsub(/_([a-z])/) { Regexp.last_match(1).upcase }
+        end
+      end # Options
+    end # Common
+  end # WebDriver
+end # Selenium

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

@@ -44,7 +44,7 @@ module Selenium
           capabilities = bridge.create_session(desired_capabilities)
 
           WebDriver.logger.info 'Forcing W3C dialect.'
-          @bridge = Remote::W3C::Bridge.new(capabilities, bridge.session_id, opts)
+          @bridge = Remote::W3C::Bridge.new(capabilities, bridge.session_id, **opts)
           @bridge.extend Edge::Bridge
 
           super(@bridge, listener: listener)

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

@@ -42,7 +42,7 @@ module Selenium
             desired_capabilities = opts.delete(:desired_capabilities)
             bridge = Remote::Bridge.new(opts)
             capabilities = bridge.create_session(desired_capabilities)
-            @bridge = Remote::W3C::Bridge.new(capabilities, bridge.session_id, opts)
+            @bridge = Remote::W3C::Bridge.new(capabilities, bridge.session_id, **opts)
             @bridge.extend Marionette::Bridge
 
             super(@bridge, listener: listener)

data/lib/selenium/webdriver/firefox/options.rb

@@ -20,7 +20,7 @@
 module Selenium
   module WebDriver
     module Firefox
-      class Options
+      class Options < WebDriver::Common::Options
         attr_reader :args, :prefs, :options, :profile
         attr_accessor :binary, :log_level
 
@@ -139,7 +139,7 @@ module Selenium
           opts[:prefs] = @prefs unless @prefs.empty?
           opts[:log] = {level: @log_level} if @log_level
 
-          {KEY => opts}
+          {KEY => generate_as_json(opts)}
         end
 
         private

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

@@ -37,7 +37,7 @@ module Selenium
           opts[:url] ||= service_url(opts)
 
           listener = opts.delete(:listener)
-          @bridge = Remote::Bridge.handshake(opts)
+          @bridge = Remote::Bridge.handshake(**opts)
           super(@bridge, listener: listener)
         end
 

data/lib/selenium/webdriver/ie/options.rb

@@ -20,7 +20,7 @@
 module Selenium
   module WebDriver
     module IE
-      class Options
+      class Options < WebDriver::Common::Options
         KEY = 'se:ieOptions'
         SCROLL_TOP = 0
         SCROLL_BOTTOM = 1
@@ -130,7 +130,7 @@ module Selenium
           opts['ie.browserCommandLineSwitches'] = @args.to_a.join(' ') if @args.any?
           opts.merge!(@options)
 
-          {KEY => opts}
+          {KEY => generate_as_json(opts)}
         end
       end # Options
     end # IE

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

@@ -57,9 +57,9 @@ module Selenium
 
           case bridge.dialect
           when :oss
-            Remote::OSS::Bridge.new(capabilities, bridge.session_id, opts)
+            Remote::OSS::Bridge.new(capabilities, bridge.session_id, **opts)
           when :w3c
-            Remote::W3C::Bridge.new(capabilities, bridge.session_id, opts)
+            Remote::W3C::Bridge.new(capabilities, bridge.session_id, **opts)
           else
             raise WebDriverError, 'cannot understand dialect'
           end

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

@@ -37,7 +37,7 @@ module Selenium
           opts[:url] ||= service_url(opts)
 
           listener = opts.delete(:listener)
-          @bridge = Remote::Bridge.handshake(opts)
+          @bridge = Remote::Bridge.handshake(**opts)
           @bridge.extend Bridge
 
           super(@bridge, listener: listener)

data/lib/selenium/webdriver/version.rb

@@ -19,6 +19,6 @@
 
 module Selenium
   module WebDriver
-    VERSION = '3.142.6'
+    VERSION = '3.142.7'
   end # WebDriver
 end # Selenium

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 3.142.6
+  version: 3.142.7
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +240,7 @@ files:
 - lib/selenium/webdriver/common/manager.rb
 - lib/selenium/webdriver/common/mouse.rb
 - lib/selenium/webdriver/common/navigation.rb
+- lib/selenium/webdriver/common/options.rb
 - lib/selenium/webdriver/common/platform.rb
 - lib/selenium/webdriver/common/port_prober.rb
 - lib/selenium/webdriver/common/profile_helper.rb