selenium-webdriver 2.53.4 → 3.0.0.beta1

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

@@ -20,6 +20,7 @@
 require 'zip'
 require 'tempfile'
 require 'find'
+require 'base64'
 
 module Selenium
   module WebDriver
@@ -28,13 +29,11 @@ module Selenium
     #
 
     module Zipper
-
-      EXTENSIONS = %w[.zip .xpi]
+      EXTENSIONS = %w[.zip .xpi].freeze
 
       class << self
-
         def unzip(path)
-          destination = Dir.mktmpdir("webdriver-unzip")
+          destination = Dir.mktmpdir('webdriver-unzip')
           FileReaper << destination
 
           Zip::File.open(path) do |zip|
@@ -59,7 +58,7 @@ module Selenium
             end
 
             zip.commit
-            File.open(zip.name, "rb") { |io| Base64.strict_encode64 io.read }
+            File.open(zip.name, 'rb') { |io| Base64.strict_encode64 io.read }
           end
         end
 
@@ -68,7 +67,7 @@ module Selenium
             add_zip_entry zip, path, File.basename(path)
 
             zip.commit
-            File.open(zip.name, "rb") { |io| Base64.strict_encode64 io.read }
+            File.open(zip.name, 'rb') { |io| Base64.strict_encode64 io.read }
           end
         end
 
@@ -78,7 +77,7 @@ module Selenium
           # can't use Tempfile here since it doesn't support File::BINARY mode on 1.8
           # can't use Dir.mktmpdir(&blk) because of http://jira.codehaus.org/browse/JRUBY-4082
           tmp_dir = Dir.mktmpdir
-          zip_path = File.join(tmp_dir, "webdriver-zip")
+          zip_path = File.join(tmp_dir, 'webdriver-zip')
 
           begin
             Zip::File.open(zip_path, Zip::File::CREATE, &blk)
@@ -94,7 +93,6 @@ module Selenium
 
           zip.add entry, file
         end
-
       end
     end # Zipper
   end # WebDriver

data/lib/selenium/webdriver/edge.rb

@@ -24,10 +24,26 @@ require 'selenium/webdriver/edge/bridge'
 
 module Selenium
   module WebDriver
-
     module Edge
+      MISSING_TEXT = <<-ERROR.tr("\n", '').freeze
+        Unable to find MicrosoftWebDriver. Please download the server from
+        https://www.microsoft.com/en-us/download/details.aspx?id=48212 and place it
+        somewhere on your PATH. More info at https://github.com/SeleniumHQ/selenium/wiki/MicrosoftWebDriver.
+      ERROR
+
       def self.driver_path=(path)
-        Service.executable_path = path
+        Platform.assert_executable path
+        @driver_path = path
+      end
+
+      def self.driver_path
+        @driver_path ||= begin
+          path = Platform.find_binary('MicrosoftWebDriver')
+          raise Error::WebDriverError, MISSING_TEXT unless path
+          Platform.assert_executable path
+
+          path
+        end
       end
 
       def self.path=(path)
@@ -38,7 +54,6 @@ module Selenium
       def self.path
         @path ||= nil
       end
-
     end # Edge
   end # WebDriver
 end # Selenium

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

@@ -20,23 +20,19 @@
 module Selenium
   module WebDriver
     module Edge
-
+      #
       # @api private
-      class Bridge < Remote::W3CBridge
+      #
 
+      class Bridge < Remote::W3CBridge
         def initialize(opts = {})
-
           http_client = opts.delete(:http_client)
 
-          if opts.has_key?(:url)
+          if opts.key?(:url)
             url = opts.delete(:url)
           else
-            @service = Service.default_service(*extract_service_args(opts))
-
-            if @service.instance_variable_get("@host") == "127.0.0.1"
-              @service.instance_variable_set("@host", 'localhost')
-            end
-
+            @service = Service.new(Edge.driver_path, Service::DEFAULT_PORT, *extract_service_args(opts))
+            @service.host = 'localhost' if @service.host == '127.0.0.1'
             @service.start
 
             url = @service.uri
@@ -45,11 +41,11 @@ module Selenium
           caps = create_capabilities(opts)
 
           remote_opts = {
-            :url                  => url,
-            :desired_capabilities => caps
+            url: url,
+            desired_capabilities: caps
           }
 
-          remote_opts.merge!(:http_client => http_client) if http_client
+          remote_opts[:http_client] = http_client if http_client
           super(remote_opts)
         end
 
@@ -78,7 +74,7 @@ module Selenium
 
         def create_capabilities(opts)
           caps               = opts.delete(:desired_capabilities) { Remote::W3CCapabilities.edge }
-          page_load_strategy = opts.delete(:page_load_strategy) || "normal"
+          page_load_strategy = opts.delete(:page_load_strategy) || 'normal'
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
@@ -92,13 +88,12 @@ module Selenium
         def extract_service_args(opts)
           args = []
 
-          if opts.has_key?(:service_log_path)
+          if opts.key?(:service_log_path)
             args << "--log-path=#{opts.delete(:service_log_path)}"
           end
 
           args
         end
-
       end # Bridge
     end # Edge
   end # WebDriver

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

@@ -20,97 +20,96 @@
 module Selenium
   module WebDriver
     module Edge
-
       module LegacySupport
-
-          # These are commands Edge is still using from JSON Wire Protocol
-        [:executeScript, :executeAsyncScript, :submitElement, :doubleClick, :mouseDown, :mouseUp, :mouseMoveTo, :click,
-         :sendKeysToActiveElement, :getWindowHandles, :getCurrentWindowHandle, :getWindowSize, :setWindowSize, :getWindowPosition,
-         :setWindowPosition, :maximizeWindow, :getAlertText, :acceptAlert, :dismissAlert].each do |cmd|
+        # These are commands Edge is still using from JSON Wire Protocol
+        %i[executeScript executeAsyncScript submitElement doubleClick
+           mouseDown mouseUp mouseMoveTo click
+           sendKeysToActiveElement getWindowHandles getCurrentWindowHandle
+           getWindowSize setWindowSize getWindowPosition setWindowPosition
+           maximizeWindow getAlertText acceptAlert dismissAlert].each do |cmd|
           jwp = Remote::Bridge::COMMANDS[cmd]
           Remote::W3CBridge.command(cmd, jwp.first, jwp.last)
         end
 
-        def executeScript(script, *args)
-          result = execute :executeScript, {}, :script => script, :args => args
+        def execute_script(script, *args)
+          result = execute :executeScript, {}, {script: script, args: args}
           unwrap_script_result result
         end
 
-        def executeAsyncScript(script, *args)
-          result = execute :executeAsyncScript, {}, :script => script, :args => args
+        def execute_async_script(script, *args)
+          result = execute :executeAsyncScript, {}, {script: script, args: args}
           unwrap_script_result result
         end
 
-        def submitElement(element)
-          execute :submitElement, :id => element
+        def submit_element(element)
+          execute :submitElement, id: element
         end
 
-        def doubleClick
+        def double_click
           execute :doubleClick
         end
 
         def click
-          execute :click, {}, :button => 0
+          execute :click, {}, {button: 0}
         end
 
-        def contextClick
-          execute :click, {}, :button => 2
+        def context_click
+          execute :click, {}, {button: 2}
         end
 
-        def mouseDown
+        def mouse_down
           execute :mouseDown
         end
 
-        def mouseUp
+        def mouse_up
           execute :mouseUp
         end
 
-        def mouseMoveTo(element, x = nil, y = nil)
-          params = { :element => element }
+        def mouse_move_to(element, x = nil, y = nil)
+          params = {element: element}
 
           if x && y
-            params.merge! :xoffset => x, :yoffset => y
+            params[:xoffset] = x
+            params[:yoffset] = y
           end
 
           execute :mouseMoveTo, {}, params
         end
 
-        def sendKeysToActiveElement(key)
-          execute :sendKeysToActiveElement, {}, :value => key
+        def send_keys_to_active_element(key)
+          execute :sendKeysToActiveElement, {}, {value: key}
         end
 
-        def getCurrentWindowHandle
+        def window_handle
           execute :getCurrentWindowHandle
         end
 
-        def getWindowSize(handle = :current)
-          data = execute :getWindowSize, :window_handle => handle
+        def window_size(handle = :current)
+          data = execute :getWindowSize, window_handle: handle
 
           Dimension.new data['width'], data['height']
         end
 
-        def setWindowSize(width, height, handle = :current)
-          execute :setWindowSize, {:window_handle => handle},
-                  :width  => width,
-                  :height => height
+        def resize_window(width, height, handle = :current)
+          execute :setWindowSize, {window_handle: handle},
+                  {width: width,
+                   height: height}
         end
 
-        def getWindowPosition(handle = :current)
-          data = execute :getWindowPosition, :window_handle => handle
+        def window_position(handle = :current)
+          data = execute :getWindowPosition, window_handle: handle
 
           Point.new data['x'], data['y']
         end
 
-        def setWindowPosition(x, y, handle = :current)
-          execute :setWindowPosition, {:window_handle => handle},
-                  :x => x, :y => y
+        def reposition_window(x, y, handle = :current)
+          execute :setWindowPosition, {window_handle: handle},
+                  {x: x, y: y}
         end
 
-        def maximizeWindow(handle = :current)
-          execute :maximizeWindow, :window_handle => handle
+        def maximize_window(handle = :current)
+          execute :maximizeWindow, window_handle: handle
         end
-
-
       end # LegacySupport
     end # Edge
   end # WebDriver

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

@@ -20,104 +20,30 @@
 module Selenium
   module WebDriver
     module Edge
-
       #
       # @api private
       #
 
-      class Service
-        START_TIMEOUT       = 20
-        SOCKET_LOCK_TIMEOUT = 45
-        STOP_TIMEOUT        = 5
-        DEFAULT_PORT        = 17556
-        MISSING_TEXT        = "Unable to find MicrosoftWebDriver. Please download the server from https://www.microsoft.com/en-us/download/details.aspx?id=48212. More info at https://github.com/SeleniumHQ/selenium/wiki/MicrosoftWebDriver."
-
-        def self.executable_path
-          @executable_path ||= (
-            path = Platform.find_binary "MicrosoftWebDriver"
-            path or raise Error::WebDriverError, MISSING_TEXT
-            Platform.assert_executable path
-
-            path
-          )
-        end
-
-        def self.executable_path=(path)
-          Platform.assert_executable path
-          @executable_path = path
-        end
-
-        def self.default_service(*extra_args)
-          new executable_path, DEFAULT_PORT, *extra_args
-        end
-
-        def initialize(executable_path, port, *extra_args)
-          @executable_path = executable_path
-          @host            = Platform.localhost
-          @port            = Integer(port)
-
-          raise Error::WebDriverError, "invalid port: #{@port}" if @port < 1
-
-          @extra_args = extra_args
-        end
-
-        def start
-          Platform.exit_hook { stop } # make sure we don't leave the server running
+      class Service < WebDriver::Service
+        DEFAULT_PORT = 17556
 
-          socket_lock.locked do
-            find_free_port
-            start_process
-            connect_until_stable
-          end
-        end
-
-        def stop
-          return if @process.nil? || @process.exited?
-
-          Net::HTTP.start(@host, @port) do |http|
-            http.open_timeout = STOP_TIMEOUT / 2
-            http.read_timeout = STOP_TIMEOUT / 2
-
-            http.head("/shutdown")
-          end
-        ensure
-          stop_process
-        end
-
-        def uri
-          URI.parse "http://#{@host}:#{@port}"
-        end
+        private
 
-        def find_free_port
-          @port = PortProber.above @port
+        def stop_server
+          connect_to_server { |http| http.head('/shutdown') }
         end
 
         def start_process
           server_command = [@executable_path, "--port=#{@port}", *@extra_args]
           @process       = ChildProcess.build(*server_command)
 
-          @process.io.inherit! if $DEBUG == true
+          @process.io.inherit! if $DEBUG
           @process.start
         end
 
-        def stop_process
-          @process.poll_for_exit STOP_TIMEOUT
-        rescue ChildProcess::TimeoutError
-          @process.stop STOP_TIMEOUT
+        def cannot_connect_error_text
+          "unable to connect to MicrosoftWebDriver #{@host}:#{@port}"
         end
-
-        def connect_until_stable
-          socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
-
-          unless socket_poller.connected?
-            raise Error::WebDriverError, "unable to connect to MicrosoftWebDriver #{@host}:#{@port}"
-          end
-        end
-
-        def socket_lock
-          @socket_lock ||= SocketLock.new(@port - 1, SOCKET_LOCK_TIMEOUT)
-        end
-
       end # Service
     end # Edge
   end # WebDriver

data/lib/selenium/webdriver/firefox.rb

@@ -35,17 +35,36 @@ require 'selenium/webdriver/firefox/service'
 module Selenium
   module WebDriver
     module Firefox
-
-      DEFAULT_PORT                    = 7055
-      DEFAULT_ENABLE_NATIVE_EVENTS    = Platform.os == :windows
-      DEFAULT_SECURE_SSL              = false
+      DEFAULT_PORT = 7055
+      DEFAULT_ENABLE_NATIVE_EVENTS = Platform.os == :windows
+      DEFAULT_SECURE_SSL = false
       DEFAULT_ASSUME_UNTRUSTED_ISSUER = true
-      DEFAULT_LOAD_NO_FOCUS_LIB       = false
+      DEFAULT_LOAD_NO_FOCUS_LIB = false
+
+      MISSING_TEXT = <<-ERROR.tr("\n", '').freeze
+        Unable to find Mozilla geckodriver. Please download the server from
+        https://github.com/mozilla/geckodriver/releases and place it
+        somewhere on your PATH. More info at https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette/WebDriver.
+      ERROR
+
+      def self.driver_path=(path)
+        Platform.assert_executable path
+        @driver_path = path
+      end
+
+      def self.driver_path
+        @driver_path ||= begin
+          path = Platform.find_binary('geckodriver*')
+          raise Error::WebDriverError, MISSING_TEXT unless path
+          Platform.assert_executable path
+
+          path
+        end
+      end
 
       def self.path=(path)
         Binary.path = path
       end
-
     end # Firefox
   end # WebDriver
 end # Selenium