selenium-webdriver 3.4.3 → 3.4.4

data/CHANGES

@@ -1,3 +1,15 @@
+3.4.4 (2017-07-13)
+==================
+
+Firefox:
+  * Added support for GeckoDriver install addon command (issue 4215).
+  * Added support for GeckoDriver uninstall addon command (issue 4215).
+  * Raise error when passing :firefox_options as capability.
+
+Ruby:
+  * Fixed a bug when childprocess were leaking /dev/null file descriptor (issue 4285).
+  * Make Remote::Driver class so that it can be inherited from.
+
 3.4.3 (2017-06-16)
 ==================
 

data/Gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: .
+  specs:
+    selenium-webdriver (3.4.3)
+      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

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

@@ -36,11 +36,7 @@ module Selenium
         private
 
         def start_process
-          server_command = [@executable_path, "--port=#{@port}", *@extra_args]
-          @process = ChildProcess.build(*server_command)
-          WebDriver.logger.debug("Executing Process #{server_command}")
-
-          @process.io.stdout = @process.io.stderr = WebDriver.logger.io
+          @process = build_process(@executable_path, "--port=#{@port}", *@extra_args)
           @process.leader = true unless Platform.windows?
           @process.start
         end

data/lib/selenium/webdriver/common.rb

@@ -59,6 +59,7 @@ require 'selenium/webdriver/common/driver_extensions/has_touch_screen'
 require 'selenium/webdriver/common/driver_extensions/has_remote_status'
 require 'selenium/webdriver/common/driver_extensions/has_network_connection'
 require 'selenium/webdriver/common/driver_extensions/uploads_files'
+require 'selenium/webdriver/common/driver_extensions/has_addons'
 require 'selenium/webdriver/common/interactions/interactions'
 require 'selenium/webdriver/common/interactions/input_device'
 require 'selenium/webdriver/common/interactions/interaction'

data/lib/selenium/webdriver/{remote/w3c/driver.rb → common/driver_extensions/has_addons.rb}

@@ -19,23 +19,32 @@
 
 module Selenium
   module WebDriver
-    module Remote
-      module W3C
+    module DriverExtensions
+      module HasAddons
 
         #
-        # Driver implementation for remote server talking W3C dialect.
-        # @api private
+        # Installs addon.
         #
+        # @param [String] path Full path to addon file
+        # @param [Boolean] temporary
+        # @return [String] identifier of installed addon
+        #
+
+        def install_addon(path, temporary = nil)
+          @bridge.install_addon(path, temporary)
+        end
+
+        #
+        # Uninstalls addon.
+        #
+        # @param [String] id Identifier of installed addon
+        #
+
+        def uninstall_addon(id)
+          @bridge.uninstall_addon(id)
+        end
 
-        class Driver < WebDriver::Driver
-          include DriverExtensions::UploadsFiles
-          include DriverExtensions::TakesScreenshot
-          include DriverExtensions::HasSessionId
-          include DriverExtensions::Rotatable
-          include DriverExtensions::HasRemoteStatus
-          include DriverExtensions::HasWebStorage
-        end # Driver
-      end # W3C
-    end # Remote
+      end # HasAddons
+    end # DriverExtensions
   end # WebDriver
 end # Selenium

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

@@ -97,11 +97,7 @@ module Selenium
       # @api private
       #
       def io
-        if debug?
-          @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
-        else
-          File.new(Platform.null_device, 'w')
-        end
+        @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
       end
 
       #

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

@@ -89,6 +89,14 @@ module Selenium
 
       private
 
+      def build_process(*command)
+        WebDriver.logger.debug("Executing Process #{command}")
+        @process = ChildProcess.build(*command)
+        @process.io.stdout = @process.io.stderr = WebDriver.logger.io if WebDriver.logger.debug?
+
+        @process
+      end
+
       def connect_to_server
         Net::HTTP.start(@host, @port) do |http|
           http.open_timeout = STOP_TIMEOUT / 2

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

@@ -36,11 +36,7 @@ module Selenium
         private
 
         def start_process
-          server_command = [@executable_path, "--port=#{@port}", *@extra_args]
-          @process = ChildProcess.build(*server_command)
-          WebDriver.logger.debug("Executing Process #{server_command}")
-
-          @process.io.stdout = @process.io.stderr = WebDriver.logger.io
+          @process = build_process(@executable_path, "--port=#{@port}", *@extra_args)
           @process.start
         end
 

data/lib/selenium/webdriver/firefox.rb

@@ -31,6 +31,7 @@ require 'selenium/webdriver/firefox/profile'
 require 'selenium/webdriver/firefox/launcher'
 require 'selenium/webdriver/firefox/legacy/driver'
 
+require 'selenium/webdriver/firefox/marionette/bridge'
 require 'selenium/webdriver/firefox/marionette/driver'
 require 'selenium/webdriver/firefox/options'
 require 'selenium/webdriver/firefox/service'

data/lib/selenium/webdriver/{remote/oss/driver.rb → firefox/marionette/bridge.rb}

@@ -19,26 +19,31 @@
 
 module Selenium
   module WebDriver
-    module Remote
-      module OSS
+    module Firefox
+      module Marionette
+        module Bridge
 
-        #
-        # Driver implementation for remote server talking OSS dialect.
-        # @api private
-        #
+          COMMANDS = {
+            install_addon: [:post, 'session/:session_id/moz/addon/install'.freeze],
+            uninstall_addon: [:post, 'session/:session_id/moz/addon/uninstall'.freeze]
+          }.freeze
 
-        class Driver < WebDriver::Driver
-          include DriverExtensions::UploadsFiles
-          include DriverExtensions::TakesScreenshot
-          include DriverExtensions::HasSessionId
-          include DriverExtensions::Rotatable
-          include DriverExtensions::HasTouchScreen
-          include DriverExtensions::HasLocation
-          include DriverExtensions::HasNetworkConnection
-          include DriverExtensions::HasRemoteStatus
-          include DriverExtensions::HasWebStorage
-        end # Driver
-      end # OSS
-    end # Remote
+          def commands(command)
+            COMMANDS[command] || super
+          end
+
+          def install_addon(path, temporary)
+            payload = {path: path}
+            payload.merge!(temporary: temporary) unless temporary.nil?
+            execute :install_addon, {}, payload
+          end
+
+          def uninstall_addon(id)
+            execute :uninstall_addon, {}, {id: id}
+          end
+
+        end # Bridge
+      end # Marionette
+    end # Firefox
   end # WebDriver
 end # Selenium

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

@@ -28,6 +28,7 @@ module Selenium
         #
 
         class Driver < WebDriver::Driver
+          include DriverExtensions::HasAddons
           include DriverExtensions::HasWebStorage
           include DriverExtensions::TakesScreenshot
 
@@ -55,6 +56,7 @@ module Selenium
             bridge = Remote::Bridge.new(opts)
             capabilities = bridge.create_session(desired_capabilities)
             @bridge = Remote::W3C::Bridge.new(capabilities, bridge.session_id, opts)
+            @bridge.extend Marionette::Bridge
 
             super(@bridge, listener: listener)
           end

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

@@ -40,11 +40,10 @@ module Selenium
         private
 
         def start_process
-          server_command = [@executable_path, "--binary=#{Firefox::Binary.path}", "--port=#{@port}", *@extra_args]
-          @process = ChildProcess.build(*server_command)
-          WebDriver.logger.debug("Executing Process #{server_command}")
-
-          @process.io.stdout = @process.io.stderr = WebDriver.logger.io
+          @process = build_process(@executable_path,
+                                   "--binary=#{Firefox::Binary.path}",
+                                   "--port=#{@port}",
+                                   *@extra_args)
           @process.start
         end
 

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

@@ -36,11 +36,7 @@ module Selenium
         private
 
         def start_process
-          server_command = [@executable_path, "--port=#{@port}", *@extra_args]
-          @process = ChildProcess.new(*server_command)
-          WebDriver.logger.debug("Executing Process #{server_command}")
-
-          @process.io.stdout = @process.io.stderr = WebDriver.logger.io
+          @process = build_process(@executable_path, "--port=#{@port}", *@extra_args)
           @process.start
         end
 

data/lib/selenium/webdriver/phantomjs/service.rb

@@ -32,11 +32,7 @@ module Selenium
         private
 
         def start_process
-          server_command = [@executable_path, "--webdriver=#{@port}", *@extra_args]
-          @process = ChildProcess.build(*server_command.compact)
-          WebDriver.logger.debug("Executing Process #{server_command}")
-
-          @process.io.stdout = @process.io.stderr = WebDriver.logger.io
+          @process = build_process(@executable_path, "--webdriver=#{@port}", *@extra_args)
           @process.start
         end
 

data/lib/selenium/webdriver/remote.rb

@@ -29,9 +29,7 @@ require 'selenium/webdriver/remote/http/default'
 require 'selenium/webdriver/remote/capabilities'
 require 'selenium/webdriver/remote/oss/bridge'
 require 'selenium/webdriver/remote/oss/commands'
-require 'selenium/webdriver/remote/oss/driver'
 
 require 'selenium/webdriver/remote/w3c/bridge'
 require 'selenium/webdriver/remote/w3c/capabilities'
 require 'selenium/webdriver/remote/w3c/commands'
-require 'selenium/webdriver/remote/w3c/driver'

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

@@ -26,16 +26,23 @@ module Selenium
       # @api private
       #
 
-      module Driver
+      class Driver < WebDriver::Driver
+        include DriverExtensions::UploadsFiles
+        include DriverExtensions::TakesScreenshot
+        include DriverExtensions::HasSessionId
+        include DriverExtensions::Rotatable
+        include DriverExtensions::HasRemoteStatus
+        include DriverExtensions::HasWebStorage
 
-        def self.new(**opts)
+        def initialize(opts = {})
           listener = opts.delete(:listener)
-          bridge = Bridge.handshake(opts)
-          if bridge.dialect == :w3c
-            W3C::Driver.new(bridge, listener: listener)
-          else
-            OSS::Driver.new(bridge, listener: listener)
+          @bridge = Bridge.handshake(opts)
+          if @bridge.dialect == :oss
+            extend DriverExtensions::HasTouchScreen
+            extend DriverExtensions::HasLocation
+            extend DriverExtensions::HasNetworkConnection
           end
+          super(@bridge, listener: listener)
         end
 
       end # Driver

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

@@ -155,6 +155,12 @@ module Selenium
                 next if value.is_a?(String) && value.empty?
 
                 capability_name = name.to_s
+
+                if capability_name == 'firefox_options'
+                  msg = ':firefox_options is no longer a valid parameter for Remote::Capabilities, use Firefox::Options instead'
+                  raise Error::WebDriverError msg
+                end
+
                 snake_cased_capability_names = KNOWN.map(&:to_s)
                 camel_cased_capability_names = snake_cased_capability_names.map(&w3c_capabilities.method(:camel_case))
 

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

@@ -46,11 +46,7 @@ module Selenium
         end
 
         def start_process
-          server_command = [@executable_path, "--port=#{@port}", *@extra_args]
-          @process = ChildProcess.build(*server_command)
-          WebDriver.logger.debug("Executing Process #{server_command}")
-
-          @process.io.stdout = @process.io.stderr = WebDriver.logger.io
+          @process = build_process(@executable_path, "--port=#{@port}", *@extra_args)
           @process.start
         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.3'
+  s.version = '3.4.4'
 
   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.3
+  version: 3.4.4
 platform: ruby
 authors: 
   - Alex Rodionov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2017-06-16 00:00:00 +07:00
+date: 2017-07-13 00:00:00 +07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -96,6 +96,7 @@ extra_rdoc_files: []
 files: 
   - CHANGES
   - Gemfile
+  - Gemfile.lock
   - LICENSE
   - README.md
   - selenium-webdriver.gemspec
@@ -150,6 +151,7 @@ files:
   - lib/selenium/webdriver/common/wait.rb
   - lib/selenium/webdriver/common/window.rb
   - lib/selenium/webdriver/common/zipper.rb
+  - lib/selenium/webdriver/common/driver_extensions/has_addons.rb
   - lib/selenium/webdriver/common/driver_extensions/has_location.rb
   - lib/selenium/webdriver/common/driver_extensions/has_network_connection.rb
   - lib/selenium/webdriver/common/driver_extensions/has_remote_status.rb
@@ -185,6 +187,7 @@ files:
   - lib/selenium/webdriver/firefox/extension/prefs.json
   - lib/selenium/webdriver/firefox/extension/webdriver.xpi
   - lib/selenium/webdriver/firefox/legacy/driver.rb
+  - lib/selenium/webdriver/firefox/marionette/bridge.rb
   - lib/selenium/webdriver/firefox/marionette/driver.rb
   - lib/selenium/webdriver/firefox/native/linux/amd64/x_ignore_nofocus.so
   - lib/selenium/webdriver/firefox/native/linux/x86/x_ignore_nofocus.so
@@ -203,11 +206,9 @@ files:
   - lib/selenium/webdriver/remote/http/persistent.rb
   - lib/selenium/webdriver/remote/oss/bridge.rb
   - lib/selenium/webdriver/remote/oss/commands.rb
-  - lib/selenium/webdriver/remote/oss/driver.rb
   - lib/selenium/webdriver/remote/w3c/bridge.rb
   - lib/selenium/webdriver/remote/w3c/capabilities.rb
   - lib/selenium/webdriver/remote/w3c/commands.rb
-  - lib/selenium/webdriver/remote/w3c/driver.rb
   - lib/selenium/webdriver/safari/driver.rb
   - lib/selenium/webdriver/safari/service.rb
   - lib/selenium/webdriver/support/abstract_event_listener.rb