selenium-webdriver 3.0.1 → 3.0.2

data/CHANGES

@@ -1,3 +1,20 @@
+3.0.2 (2016-11-25)
+===================
+
+Ruby:
+  * Implement #driver_path as parameter when initializing a driver (thanks lmtierney)
+  * Improve Ruby syntax in driver commands (thanks joe_schulte)
+  * Improve performance when shutting down drivers (thanks lmtierney)
+  * Fix bug for finding open ports on Windows (thanks kou1okada)
+  * Fix bug in auto detection of drivers which allowed selection of non-executable binaries
+
+W3C:
+  * Implement #cookie_named and #delete_all_cookies methods (thanks lmtierney)

+  * Implement element #property method (thanks lmtierney)

+
+Chrome:
+  * Fix bug in switches (thanks danvine)

+
 3.0.1 (2016-11-06)
 ===================
 

data/lib/selenium/webdriver/chrome.rb

@@ -26,25 +26,25 @@ require 'selenium/webdriver/chrome/profile'
 module Selenium
   module WebDriver
     module Chrome
-      MISSING_TEXT = <<-ERROR.tr("\n", '').freeze
-        Unable to find chromedriver. Please download the server from
-        http://chromedriver.storage.googleapis.com/index.html and place it
-        somewhere on your PATH. More info at https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver.
-      ERROR
-
       def self.driver_path=(path)
+        warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
+          [DEPRECATION] `driver_path=` is deprecated. Pass the driver path as an option instead.
+          e.g. Selenium::WebDriver.for :chrome, driver_path: '/path'
+        DEPRECATE
+
         Platform.assert_executable path
         @driver_path = path
       end
 
-      def self.driver_path
-        @driver_path ||= begin
-          path = Platform.find_binary('chromedriver')
-          raise Error::WebDriverError, MISSING_TEXT unless path
-          Platform.assert_executable path
-
-          path
+      def self.driver_path(warning = true)
+        if warning
+          warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
+            [DEPRECATION] `driver_path` is deprecated. Pass the driver path as an option instead.
+            e.g. Selenium::WebDriver.for :chrome, driver_path: '/path'
+          DEPRECATE
         end
+
+        @driver_path ||= nil
       end
 
       def self.path=(path)

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

@@ -31,7 +31,8 @@ module Selenium
           end
 
           unless opts.key?(:url)
-            @service = Service.new(Chrome.driver_path, port, *extract_service_args(service_args))
+            driver_path = opts.delete(:driver_path) || Chrome.driver_path(false)
+            @service = Service.new(driver_path, port, *extract_service_args(service_args))
             @service.start
             opts[:url] = @service.uri
           end
@@ -100,8 +101,8 @@ module Selenium
           service_args << "--url-base=#{args.delete(:url_base)}" if args.key?(:url_base)
           service_args << "--port-server=#{args.delete(:port_server)}" if args.key?(:port_server)
           service_args << "--whitelisted-ips=#{args.delete(:whitelisted_ips)}" if args.key?(:whitelisted_ips)
-          service_args << "--verbose=#{args.delete(:verbose)}" if args.key?(:whitelisted_ips)
-          service_args << "--silent=#{args.delete(:silent)}" if args.key?(:whitelisted_ips)
+          service_args << "--verbose=#{args.delete(:verbose)}" if args.key?(:verbose)
+          service_args << "--silent=#{args.delete(:silent)}" if args.key?(:silent)
           service_args
         end
       end # Bridge

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

@@ -26,6 +26,12 @@ module Selenium
 
       class Service < WebDriver::Service
         DEFAULT_PORT = 9515
+        @executable = 'chromedriver'.freeze
+        @missing_text = <<-ERROR.gsub(/\n +| {2,}/, ' ').freeze
+          Unable to find chromedriver. Please download the server from
+          http://chromedriver.storage.googleapis.com/index.html and place it somewhere on your PATH.
+          More info at https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver.
+        ERROR
 
         private
 
@@ -37,10 +43,6 @@ module Selenium
           @process.start
         end
 
-        def stop_server
-          connect_to_server { |http| http.get('/shutdown') }
-        end
-
         def cannot_connect_error_text
           "unable to connect to chromedriver #{@host}:#{@port}"
         end

data/lib/selenium/webdriver/common.rb

@@ -39,6 +39,7 @@ require 'selenium/webdriver/common/timeouts'
 require 'selenium/webdriver/common/window'
 require 'selenium/webdriver/common/logs'
 require 'selenium/webdriver/common/options'
+require 'selenium/webdriver/common/w3c_options'
 require 'selenium/webdriver/common/search_context'
 require 'selenium/webdriver/common/action_builder'
 require 'selenium/webdriver/common/touch_action_builder'

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

@@ -121,7 +121,7 @@ module Selenium
       #
 
       def manage
-        @manage ||= WebDriver::Options.new(bridge)
+        bridge.options
       end
 
       #

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

@@ -118,6 +118,20 @@ module Selenium
         bridge.element_attribute self, name
       end
 
+      #
+      # Get the value of a the given property with the same name of the element. If the value is not
+      # set, nil is returned.
+      #
+      # @param [String]
+      #   property name
+      # @return [String,nil]
+      #   property value
+      #
+
+      def property(name)
+        bridge.element_property self, name
+      end
+
       #
       # Get the text content of this element
       #

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

@@ -90,16 +90,7 @@ module Selenium
       #
 
       def all_cookies
-        @bridge.cookies.map do |cookie|
-          {
-            name: cookie['name'],
-            value: cookie['value'],
-            path: cookie['path'],
-            domain: cookie['domain'] && strip_port(cookie['domain']),
-            expires: cookie['expiry'] && datetime_at(cookie['expiry']),
-            secure: cookie['secure']
-          }
-        end
+        @bridge.cookies.map { |cookie| convert_cookie(cookie) }
       end
 
       def timeouts
@@ -146,6 +137,17 @@ module Selenium
       def strip_port(str)
         str.split(':', 2).first
       end
+
+      def convert_cookie(cookie)
+        {
+          name: cookie['name'],
+          value: cookie['value'],
+          path: cookie['path'],
+          domain: cookie['domain'] && strip_port(cookie['domain']),
+          expires: cookie['expiry'] && datetime_at(cookie['expiry']),
+          secure: cookie['secure']
+        }
+      end
     end # Options
   end # WebDriver
 end # Selenium

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

@@ -38,8 +38,9 @@ module Selenium
         port
       end
 
-      IGNORED_ERRORS = [Errno::EADDRNOTAVAIL].freeze
+      IGNORED_ERRORS = [Errno::EADDRNOTAVAIL]
       IGNORED_ERRORS << Errno::EBADF if Platform.cygwin?
+      IGNORED_ERRORS.freeze
 
       def self.free?(port)
         Platform.interfaces.each do |host|

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

@@ -36,10 +36,17 @@ module Selenium
       SOCKET_LOCK_TIMEOUT = 45
       STOP_TIMEOUT        = 20
 
+      @executable = nil
+      @missing_text = nil
+
+      class << self
+        attr_reader :executable, :missing_text
+      end
+
       attr_accessor :host
 
       def initialize(executable_path, port, *extra_args)
-        @executable_path = executable_path
+        @executable_path = binary_path(executable_path)
         @host            = Platform.localhost
         @port            = Integer(port)
         @extra_args      = extra_args
@@ -47,6 +54,13 @@ module Selenium
         raise Error::WebDriverError, "invalid port: #{@port}" if @port < 1
       end
 
+      def binary_path(path)
+        path = Platform.find_binary(self.class.executable) if path.nil?
+        raise Error::WebDriverError, self.class.missing_text unless path
+        Platform.assert_executable path
+        path
+      end
+
       def start
         if process_running?
           raise "already started: #{uri.inspect} #{@executable_path.inspect}"
@@ -62,8 +76,9 @@ module Selenium
       end
 
       def stop
-        return if process_exited?
         stop_server
+        @process.poll_for_exit STOP_TIMEOUT
+      rescue ChildProcess::TimeoutError
       ensure
         stop_process
       end
@@ -91,16 +106,16 @@ module Selenium
         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
+        return if process_exited?
         @process.stop STOP_TIMEOUT
       end
 
+      def stop_server
+        return if process_exited?
+        connect_to_server { |http| http.get('/shutdown') }
+      end
+
       def process_running?
         @process && @process.alive?
       end

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

@@ -0,0 +1,45 @@
+# 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
+    class W3COptions < Options
+
+      #
+      # Get the cookie with the given name
+      #
+      # @param [String] name the name of the cookie
+      # @return [Hash, nil] the cookie, or nil if it wasn't found.
+      #
+
+      def cookie_named(name)
+        convert_cookie(@bridge.cookie(name))
+      end
+
+      #
+      # Delete all cookies
+      #
+
+      def delete_all_cookies
+        @bridge.delete_all_cookies
+      end
+
+    end # WC3Options
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/edge.rb

@@ -25,25 +25,25 @@ 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)
+        warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
+          [DEPRECATION] `driver_path=` is deprecated. Pass the driver path as an option instead.
+          e.g. Selenium::WebDriver.for :edge, driver_path: '/path'
+        DEPRECATE
+
         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
+      def self.driver_path(warning = true)
+        if warning
+          warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
+            [DEPRECATION] `driver_path` is deprecated. Pass the driver path as an option instead.
+            e.g. Selenium::WebDriver.for :edge, driver_path: '/path'
+          DEPRECATE
         end
+
+        @driver_path ||= nil
       end
     end # Edge
   end # WebDriver

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

@@ -28,8 +28,10 @@ module Selenium
         def initialize(opts = {})
           port = opts.delete(:port) || Service::DEFAULT_PORT
           service_args = opts.delete(:service_args) || {}
+
           unless opts.key?(:url)
-            @service = Service.new(Edge.driver_path, port, *extract_service_args(service_args))
+            driver_path = opts.delete(:driver_path) || Edge.driver_path(false)
+            @service = Service.new(driver_path, port, *extract_service_args(service_args))
             @service.host = 'localhost' if @service.host == '127.0.0.1'
             @service.start
             opts[:url] = @service.uri
@@ -51,6 +53,20 @@ module Selenium
           ]
         end
 
+        def commands(command)
+          unsupported = %i[execute_script execute_async_script submit_element double_click
+           mouse_down mouse_up mouse_move_to click
+           send_keys_to_active_element get_window_handles get_current_window_handle
+           get_window_size set_window_size get_window_position set_window_position
+           maximize_window get_alert_text accept_alert dismiss_alert]
+          if unsupported.include? command
+            Remote::Bridge::COMMANDS[command]
+          else
+            super
+          end
+
+        end
+
         def capabilities
           @capabilities ||= Remote::Capabilities.edge
         end
@@ -61,6 +77,87 @@ module Selenium
           @service.stop if @service
         end
 
+        def execute_script(script, *args)
+          result = execute :execute_script, {}, {script: script, args: args}
+          unwrap_script_result result
+        end
+
+        def execute_async_script(script, *args)
+          result = execute :execute_async_script, {}, {script: script, args: args}
+          unwrap_script_result result
+        end
+
+        def submit_element(element)
+          execute :submit_element, id: element['ELEMENT']
+        end
+
+        def double_click
+          execute :double_click
+        end
+
+        def click
+          execute :click, {}, {button: 0}
+        end
+
+        def context_click
+          execute :click, {}, {button: 2}
+        end
+
+        def mouse_down
+          execute :mouse_down
+        end
+
+        def mouse_up
+          execute :mouse_up
+        end
+
+        def mouse_move_to(element, x = nil, y = nil)
+          element_id = element['ELEMENT'] if element
+          params = {element: element_id}
+
+          if x && y
+            params[:xoffset] = x
+            params[:yoffset] = y
+          end
+
+          execute :mouse_move_to, {}, params
+        end
+
+        def send_keys_to_active_element(key)
+          execute :send_keys_to_active_element, {}, {value: key}
+        end
+
+        def window_handle
+          execute :get_current_window_handle
+        end
+
+        def window_size(handle = :current)
+          data = execute :get_window_size, window_handle: handle
+
+          Dimension.new data['width'], data['height']
+        end
+
+        def resize_window(width, height, handle = :current)
+          execute :set_window_size, {window_handle: handle},
+                  {width: width,
+                   height: height}
+        end
+
+        def window_position(handle = :current)
+          data = execute :get_window_position, window_handle: handle
+
+          Point.new data['x'], data['y']
+        end
+
+        def reposition_window(x, y, handle = :current)
+          execute :set_window_position, {window_handle: handle},
+                  {x: x, y: y}
+        end
+
+        def maximize_window(handle = :current)
+          execute :maximize_window, window_handle: handle
+        end
+
         private
 
         def extract_service_args(args = {})