selenium-webdriver 2.53.4 → 3.0.0.beta1

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

@@ -38,7 +38,7 @@ module Selenium
         port
       end
 
-      IGNORED_ERRORS = [Errno::EADDRNOTAVAIL]
+      IGNORED_ERRORS = [Errno::EADDRNOTAVAIL].freeze
       IGNORED_ERRORS << Errno::EBADF if Platform.cygwin?
 
       def self.free?(port)
@@ -55,7 +55,6 @@ module Selenium
       rescue SocketError, Errno::EADDRINUSE
         false
       end
-
     end # PortProber
   end # WebDriver
 end # Selenium

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

@@ -19,7 +19,6 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     #
@@ -28,27 +27,26 @@ module Selenium
     #
 
     module ProfileHelper
-
       def self.included(base)
         base.extend ClassMethods
       end
 
-      def as_json(opts = nil)
+      def as_json(*)
         {'zip' => Zipper.zip(layout_on_disk)}
       end
 
-      def to_json(*args)
+      def to_json(*)
         JSON.generate as_json
       end
 
       private
 
       def create_tmp_copy(directory)
-        tmp_directory = Dir.mktmpdir("webdriver-rb-profilecopy")
+        tmp_directory = Dir.mktmpdir('webdriver-rb-profilecopy')
 
         # TODO: must be a better way..
         FileUtils.rm_rf tmp_directory
-        FileUtils.mkdir_p File.dirname(tmp_directory), :mode => 0700
+        FileUtils.mkdir_p File.dirname(tmp_directory), mode: 0700
         FileUtils.cp_r directory, tmp_directory
 
         tmp_directory
@@ -72,7 +70,7 @@ module Selenium
           tmp_dir = Dir.mktmpdir
           begin
             zip_path = File.join(tmp_dir, "webdriver-profile-duplicate-#{json.hash}.zip")
-            File.open(zip_path, "wb") { |zip_file| zip_file << Base64.decode64(data) }
+            File.open(zip_path, 'wb') { |zip_file| zip_file << Base64.decode64(data) }
 
             new Zipper.unzip(zip_path)
           ensure
@@ -80,7 +78,6 @@ module Selenium
           end
         end
       end # ClassMethods
-
     end # ProfileHelper
   end # WebDriver
 end # Selenium

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

@@ -21,45 +21,56 @@ module Selenium
   module WebDriver
     class Proxy
       TYPES = {
-        :direct      => "DIRECT",     # Direct connection, no proxy (default on Windows).
-        :manual      => "MANUAL",     # Manual proxy settings (e.g., for httpProxy).
-        :pac         => "PAC",        # Proxy autoconfiguration from URL.
-        :auto_detect => "AUTODETECT", # Proxy autodetection (presumably with WPAD).
-        :system      => "SYSTEM"      # Use system settings (default on Linux).
-      }
-
-      attr_reader :type,
-                  :ftp,
-                  :http,
-                  :socks,
-                  :socks_username,
-                  :socks_password,
-                  :no_proxy,
-                  :pac,
-                  :ssl,
-                  :auto_detect
+        direct: 'DIRECT', # Direct connection, no proxy (default on Windows).
+        manual: 'MANUAL', # Manual proxy settings (e.g., for httpProxy).
+        pac: 'PAC', # Proxy autoconfiguration from URL.
+        auto_detect: 'AUTODETECT', # Proxy autodetection (presumably with WPAD).
+        system: 'SYSTEM' # Use system settings (default on Linux).
+      }.freeze
+
+      ALLOWED = {type: 'proxyType',
+                 ftp: 'ftpProxy',
+                 http: 'httpProxy',
+                 no_proxy: 'noProxy',
+                 pac: 'proxyAutoconfigUrl',
+                 ssl: 'sslProxy',
+                 auto_detect: 'autodetect',
+                 socks: 'socksProxy',
+                 socks_username: 'socksUsername',
+                 socks_password: 'socksPassword'}.freeze
+
+      ALLOWED.keys.each { |t| attr_reader t }
+
+      def self.json_create(data)
+        data['proxyType'] = data['proxyType'].downcase.to_sym
+        return if data['proxyType'] == :unspecified
+
+        proxy = new
+
+        ALLOWED.each do |k, v|
+          proxy.send("#{k}=", data[v]) if data.key?(v)
+        end
+
+        proxy
+      end
 
       def initialize(opts = {})
-        opts = opts.dup
-
-        self.type           = opts.delete(:type) if opts.has_key? :type
-        self.ftp            = opts.delete(:ftp) if opts.has_key? :ftp
-        self.http           = opts.delete(:http) if opts.has_key? :http
-        self.no_proxy       = opts.delete(:no_proxy) if opts.has_key? :no_proxy
-        self.ssl            = opts.delete(:ssl) if opts.has_key? :ssl
-        self.pac            = opts.delete(:pac) if opts.has_key? :pac
-        self.auto_detect    = opts.delete(:auto_detect) if opts.has_key? :auto_detect
-        self.socks          = opts.delete(:socks) if opts.has_key? :socks
-        self.socks_username = opts.delete(:socks_username) if opts.has_key? :socks_username
-        self.socks_password = opts.delete(:socks_password) if opts.has_key? :socks_password
-
-        unless opts.empty?
-          raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
+        not_allowed = []
+
+        opts.each do |k, v|
+          if ALLOWED.key?(k)
+            send("#{k}=", v)
+          else
+            not_allowed << k
+          end
         end
+
+        return if not_allowed.empty?
+        raise ArgumentError, "unknown option#{'s' if not_allowed.size != 1}: #{not_allowed.inspect}"
       end
 
       def ==(other)
-        other.kind_of?(self.class) && as_json == other.as_json
+        other.is_a?(self.class) && as_json == other.as_json
       end
       alias_method :eql?, :==
 
@@ -109,7 +120,7 @@ module Selenium
       end
 
       def type=(type)
-        unless TYPES.has_key? type
+        unless TYPES.key? type
           raise ArgumentError, "invalid proxy type: #{type.inspect}, expected one of #{TYPES.keys.inspect}"
         end
 
@@ -120,49 +131,26 @@ module Selenium
         @type = type
       end
 
-      def as_json(opts = nil)
+      def as_json(*)
         json_result = {
-          "proxyType" => TYPES[type]
-        }
-
-        json_result["ftpProxy"]           = ftp if ftp
-        json_result["httpProxy"]          = http if http
-        json_result["noProxy"]            = no_proxy if no_proxy
-        json_result["proxyAutoconfigUrl"] = pac if pac
-        json_result["sslProxy"]           = ssl if ssl
-        json_result["autodetect"]         = auto_detect if auto_detect
-        json_result["socksProxy"]         = socks if socks
-        json_result["socksUsername"]      = socks_username if socks_username
-        json_result["socksPassword"]      = socks_password if socks_password
+          'proxyType' => TYPES[type],
+          'ftpProxy' => ftp,
+          'httpProxy' => http,
+          'noProxy' => no_proxy,
+          'proxyAutoconfigUrl' => pac,
+          'sslProxy' => ssl,
+          'autodetect' => auto_detect,
+          'socksProxy' => socks,
+          'socksUsername' => socks_username,
+          'socksPassword' => socks_password
+        }.delete_if { |_k, v| v.nil? }
 
         json_result if json_result.length > 1
       end
 
-      def to_json(*args)
+      def to_json(*)
         JSON.generate as_json
       end
-
-      class << self
-        def json_create(data)
-          return if data['proxyType'] == 'UNSPECIFIED'
-
-          proxy = new
-
-          proxy.type           = data['proxyType'].downcase.to_sym if data.has_key? 'proxyType'
-          proxy.ftp            = data['ftpProxy'] if data.has_key? 'ftpProxy'
-          proxy.http           = data['httpProxy'] if data.has_key? 'httpProxy'
-          proxy.no_proxy       = data['noProxy'] if data.has_key? 'noProxy'
-          proxy.pac            = data['proxyAutoconfigUrl'] if data.has_key? 'proxyAutoconfigUrl'
-          proxy.ssl            = data['sslProxy'] if data.has_key? 'sslProxy'
-          proxy.auto_detect    = data['autodetect'] if data.has_key? 'autodetect'
-          proxy.socks          = data['socksProxy'] if data.has_key? 'socksProxy'
-          proxy.socks_username = data['socksUsername'] if data.has_key? 'socksUsername'
-          proxy.socks_password = data['socksPassword'] if data.has_key? 'socksPassword'
-
-          proxy
-        end
-      end # class << self
-
     end # Proxy
   end # WebDriver
 end # Selenium

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

@@ -20,20 +20,19 @@
 module Selenium
   module WebDriver
     module SearchContext
-
       # @api private
       FINDERS = {
-        :class             => 'class name',
-        :class_name        => 'class name',
-        :css               => 'css selector',
-        :id                => 'id',
-        :link              => 'link text',
-        :link_text         => 'link text',
-        :name              => 'name',
-        :partial_link_text => 'partial link text',
-        :tag_name          => 'tag name',
-        :xpath             => 'xpath',
-      }
+        class: 'class name',
+        class_name: 'class name',
+        css: 'css selector',
+        id: 'id',
+        link: 'link text',
+        link_text: 'link text',
+        name: 'name',
+        partial_link_text: 'partial link text',
+        tag_name: 'tag name',
+        xpath: 'xpath'
+      }.freeze
 
       #
       # Find the first element matching the given arguments.
@@ -54,9 +53,8 @@ module Selenium
       def find_element(*args)
         how, what = extract_args(args)
 
-        unless by = FINDERS[how.to_sym]
-          raise ArgumentError, "cannot find element by #{how.inspect}"
-        end
+        by = FINDERS[how.to_sym]
+        raise ArgumentError, "cannot find element by #{how.inspect}" unless by
 
         bridge.find_element_by by, what.to_s, ref
       rescue Selenium::WebDriver::Error::TimeOutError
@@ -77,9 +75,8 @@ module Selenium
       def find_elements(*args)
         how, what = extract_args(args)
 
-        unless by = FINDERS[how.to_sym]
-          raise ArgumentError, "cannot find elements by #{how.inspect}"
-        end
+        by = FINDERS[how.to_sym]
+        raise ArgumentError, "cannot find elements by #{how.inspect}" unless by
 
         bridge.find_elements_by by, what.to_s, ref
       rescue Selenium::WebDriver::Error::TimeOutError
@@ -111,7 +108,6 @@ module Selenium
           raise ArgumentError, "wrong number of arguments (#{args.size} for 2)"
         end
       end
-
     end # SearchContext
   end # WebDriver
 end # Selenium

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

@@ -0,0 +1,127 @@
+# encoding: utf-8
+#
+# 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
+    #
+    # Base class implementing default behavior of service object,
+    # responsible for starting and stopping driver implementations.
+    #
+    # Subclasses must implement the following private methods:
+    #   * #start_process
+    #   * #stop_server
+    #   * #cannot_connect_error_text
+    #
+    # @api private
+    #
+
+    class Service
+      START_TIMEOUT       = 20
+      SOCKET_LOCK_TIMEOUT = 45
+      STOP_TIMEOUT        = 5
+
+      attr_accessor :host
+
+      def initialize(executable_path, port, *extra_args)
+        @executable_path = executable_path
+        @host            = Platform.localhost
+        @port            = Integer(port)
+        @extra_args      = extra_args
+
+        raise Error::WebDriverError, "invalid port: #{@port}" if @port < 1
+      end
+
+      def start
+        if process_running?
+          raise "already started: #{uri.inspect} #{@executable_path.inspect}"
+        end
+
+        Platform.exit_hook { stop } # make sure we don't leave the server running
+
+        socket_lock.locked do
+          find_free_port
+          start_process
+          connect_until_stable
+        end
+      end
+
+      def stop
+        return if process_exited?
+        stop_server
+      ensure
+        stop_process
+      end
+
+      def uri
+        @uri ||= URI.parse("http://#{@host}:#{@port}")
+      end
+
+      private
+
+      def connect_to_server
+        Net::HTTP.start(@host, @port) do |http|
+          http.open_timeout = STOP_TIMEOUT / 2
+          http.read_timeout = STOP_TIMEOUT / 2
+
+          yield http
+        end
+      end
+
+      def find_free_port
+        @port = PortProber.above(@port)
+      end
+
+      def start_process
+        raise NotImplementedError, 'subclass responsibility'
+      end
+
+      def stop_server
+        raise NotImplementedError, 'subclass responsibility'
+      end
+
+      def stop_process
+        @process.poll_for_exit STOP_TIMEOUT
+      rescue ChildProcess::TimeoutError
+        @process.stop STOP_TIMEOUT
+      end
+
+      def process_running?
+        @process && @process.alive?
+      end
+
+      def process_exited?
+        @process.nil? || @process.exited?
+      end
+
+      def connect_until_stable
+        socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
+        return if socket_poller.connected?
+        raise Error::WebDriverError, cannot_connect_error_text
+      end
+
+      def cannot_connect_error_text
+        raise NotImplementedError, 'subclass responsibility'
+      end
+
+      def socket_lock
+        @socket_lock ||= SocketLock.new(@port - 1, SOCKET_LOCK_TIMEOUT)
+      end
+    end # Service
+  end # WebDriver
+end # Selenium

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

@@ -19,13 +19,11 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     #
 
     class SocketLock
-
       def initialize(port, timeout)
         @port    = port
         @timeout = timeout
@@ -36,7 +34,7 @@ module Selenium
       # execution block if the lock could be successfully obtained.
       #
 
-      def locked(&blk)
+      def locked
         lock
 
         begin
@@ -51,13 +49,10 @@ module Selenium
       def lock
         max_time = Time.now + @timeout
 
-        until can_lock? || Time.now >= max_time
-          sleep 0.1
-        end
+        sleep 0.1 until can_lock? || Time.now >= max_time
 
-        unless did_lock?
-          raise Error::WebDriverError, "unable to bind to locking port #{@port} within #{@timeout} seconds"
-        end
+        return if did_lock?
+        raise Error::WebDriverError, "unable to bind to locking port #{@port} within #{@timeout} seconds"
       end
 
       def release
@@ -75,9 +70,8 @@ module Selenium
       end
 
       def did_lock?
-        !!@server
+        !@server.nil?
       end
-
     end # SocketLock
   end # WebDriver
 end # Selenium