selenium-webdriver 3.3.0 → 3.4.0

data/CHANGES

@@ -1,6 +1,24 @@
+3.4.0 (Unreleased)
+===================
+
+Edge:
+  * Fix bug when response is not wrapped with "value"
+
+Firefox:
+  * Support geckodriver v0.16
+
+Ruby:
+  * Support ElementClickIntercepted error from W3C spec
+  * Support ElementNotInteractable error from W3C spec
+  * Implement window rect commands
+  * Implement window minimize command
+
 3.3.0 (2017-03-07)
 ===================
 
+Firefox:
+  * geckodriver v0.15 or later is required
+
 W3C:
   * Support for command response data to be wrapped in a 'value' key
   * Support for updated timeout formats

data/lib/selenium/webdriver.rb

@@ -30,6 +30,7 @@ module Selenium
   module WebDriver
     Point     = Struct.new(:x, :y)
     Dimension = Struct.new(:width, :height)
+    Rectangle = Struct.new(:x, :y, :width, :height)
     Location  = Struct.new(:latitude, :longitude, :altitude)
 
     autoload :Chrome,    'selenium/webdriver/chrome'

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

@@ -235,6 +235,16 @@ module Selenium
         bridge.element_location @id
       end
 
+      #
+      # Get the dimensions and coordinates of this element.
+      #
+      # @return [WebDriver::Rectangle]
+      #
+
+      def rect
+        bridge.element_rect @id
+      end
+
       #
       # Determine an element's location on the screen once it has been scrolled into view.
       #

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

@@ -178,6 +178,19 @@ module Selenium
 
       class UnsupportedOperationError < WebDriverError; end
 
+      #
+      # Indicates that the Element Click command could not be completed because the element receiving the events
+      # is obscuring the element that was requested clicked.
+      #
+
+      class ElementClickIntercepted < WebDriverError; end
+
+      #
+      # Indicates that a command could not be completed because the element is not pointer or keyboard interactable.
+      #
+
+      class ElementNotInteractable < WebDriverError; end
+
       # aliased for backwards compatibility
       NoAlertPresentError       = NoSuchAlertError
       ScriptTimeOutError        = ScriptTimeoutError

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

@@ -82,6 +82,34 @@ module Selenium
         @bridge.window_position
       end
 
+      #
+      # Sets the current window rect to the given point and position.
+      #
+      # @param [Selenium::WebDriver::Rectangle, #x, #y, #width, #height] rectangle The new rect.
+      #
+
+      def rect=(rectangle)
+        unless %w[x y width height].all? { |val| rectangle.respond_to? val }
+          raise ArgumentError, "expected #{rectangle.inspect}:#{rectangle.class}" \
+                               ' to respond to #x, #y, #width, and #height'
+        end
+
+        @bridge.set_window_rect(x: rectangle.x,
+                                y: rectangle.y,
+                                width: rectangle.width,
+                                height: rectangle.height)
+      end
+
+      #
+      # Get the rect of the current window.
+      #
+      # @return [Selenium::WebDriver::Rectangle] The rectangle.
+      #
+
+      def rect
+        @bridge.window_rect
+      end
+
       #
       # Equivalent to #size=, but accepts width and height arguments.
       #
@@ -115,6 +143,14 @@ module Selenium
         @bridge.maximize_window
       end
 
+      #
+      # Minimize the current window
+      #
+
+      def minimize
+        @bridge.minimize_window
+      end
+
       #
       # Make current window full screen
       #

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

@@ -115,6 +115,50 @@ module Selenium
         def maximize_window(handle = :current)
           execute :maximize_window, window_handle: handle
         end
+
+        def create_session(desired_capabilities)
+          resp = raw_execute :new_session, {}, {desiredCapabilities: desired_capabilities}
+          @session_id = resp['sessionId']
+          return Remote::W3CCapabilities.json_create resp['value'] if @session_id
+
+          raise Error::WebDriverError, 'no sessionId in returned payload'
+        end
+
+        #
+        # executes a command on the remote server.
+        #
+        #
+        # Returns the 'value' of the returned payload
+        #
+
+        def execute(*args)
+          result = raw_execute(*args)
+          result.payload.key?('value') ? result['value'] : result
+        end
+
+        #
+        # executes a command on the remote server.
+        #
+        # @return [WebDriver::Remote::Response]
+        #
+
+        def raw_execute(command, opts = {}, command_hash = nil)
+          verb, path = commands(command) || raise(ArgumentError, "unknown command: #{command.inspect}")
+          path = path.dup
+
+          path[':session_id'] = @session_id if path.include?(':session_id')
+
+          begin
+            opts.each do |key, value|
+              path[key.inspect] = escaper.escape(value.to_s)
+            end
+          rescue IndexError
+            raise ArgumentError, "#{opts.inspect} invalid for #{command.inspect}"
+          end
+
+          WebDriver.logger.info("-> #{verb.to_s.upcase} #{path}")
+          http.call verb, path, command_hash
+        end
       end # Bridge
     end # Edge
   end # WebDriver

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

@@ -60,22 +60,52 @@ module Selenium
           @service.stop if @service
         end
 
+        # Support for geckodriver < 0.15
+        def resize_window(width, height, handle = :current)
+          super
+        rescue Error::UnknownCommandError
+          execute :set_window_size, {}, {width: width, height: height}
+        end
+
+        def window_size(handle = :current)
+          data = super
+        rescue Error::UnknownCommandError
+          data = execute :get_window_size
+        ensure
+          return Dimension.new data['width'], data['height']
+        end
+
+        def reposition_window(x, y)
+          super
+        rescue Error::UnknownCommandError
+          execute :set_window_position, {}, {x: x, y: y}
+        end
+
+        def window_position
+          data = super
+        rescue Error::UnknownCommandError
+          data = execute :get_window_position
+        ensure
+          return Point.new data['x'], data['y']
+        end
+
         private
 
         def create_capabilities(opts)
           caps = Remote::W3CCapabilities.firefox
           caps.merge!(opts.delete(:desired_capabilities)) if opts.key? :desired_capabilities
-          firefox_options_caps = caps[:firefox_options] || {}
-          caps[:firefox_options] = firefox_options_caps.merge(opts[:firefox_options] || {})
+          firefox_options = caps[:firefox_options] || {}
+          firefox_options = firefox_options_caps.merge(opts[:firefox_options]) if opts.key?(:firefox_options)
           if opts.key?(:profile)
             profile = opts.delete(:profile)
             unless profile.is_a?(Profile)
               profile = Profile.from_name(profile)
             end
-            caps[:firefox_options][:profile] = profile.encoded
+            firefox_options[:profile] = profile.encoded
           end
 
-          Binary.path = caps[:firefox_options][:binary] if caps[:firefox_options].key?(:binary)
+          Binary.path = firefox_options[:binary] if firefox_options.key?(:binary)
+          caps[:firefox_options] = firefox_options unless firefox_options.empty?
           caps
         end
       end # W3CBridge

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

@@ -39,12 +39,14 @@ module Selenium
         def initialize(opts = {})
           opts = opts.dup
 
-          if opts.key?(:port)
-            WebDriver.logger.warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-            [DEPRECATION] `:port` is deprecated. Use `:url` with full path
-            DEPRECATE
-          end
-          port = opts.delete(:port) || 4444
+          port = if opts.key?(:port)
+                   WebDriver.logger.warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
+                   [DEPRECATION] `:port` is deprecated. Use `:url` with full path
+                   DEPRECATE
+                   opts.delete(:port)
+                 else
+                   4444
+                 end
 
           http_client = opts.delete(:http_client) { Http::Default.new }
           desired_capabilities = opts.delete(:desired_capabilities) { Capabilities.firefox }
@@ -571,6 +573,13 @@ module Selenium
           Point.new data['x'], data['y']
         end
 
+        def element_rect(element)
+          loc = execute :get_element_location, id: element
+          size = execute :get_element_size, id: element
+
+          Rectangle.new loc['x'], loc['y'], size['width'], size['height']
+        end
+
         def element_location_once_scrolled_into_view(element)
           data = execute :get_element_location_once_scrolled_into_view, id: element
 

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

@@ -139,7 +139,7 @@ module Selenium
             caps = new
             caps.browser_name          = data.delete('browserName')
             caps.version               = data.delete('version')
-            caps.platform              = data.delete('platform').downcase.to_sym if data.key?('platform')
+            caps.platform              = data.delete('platform').downcase.tr(' ','_').to_sym if data.key?('platform')
             caps.javascript_enabled    = data.delete('javascriptEnabled')
             caps.css_selectors_enabled = data.delete('cssSelectorsEnabled')
             caps.takes_screenshot      = data.delete('takesScreenshot')

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

@@ -113,7 +113,7 @@ module Selenium
         def create_session(desired_capabilities)
           resp = execute :new_session, {}, {desiredCapabilities: desired_capabilities}
           @session_id = resp['sessionId']
-          return W3CCapabilities.json_create resp['value'] if @session_id
+          return W3CCapabilities.json_create(resp['capabilities'] || resp['value']) if @session_id
 
           raise Error::WebDriverError, 'no sessionId in returned payload'
         end
@@ -152,7 +152,7 @@ module Selenium
         end
 
         def alert=(keys)
-          execute :send_alert_text, {}, {value: keys.split(//)}
+          execute :send_alert_text, {}, {value: keys.split(//), text: keys}
         end
 
         def alert_text
@@ -234,39 +234,51 @@ module Selenium
           unless handle == :current
             raise Error::WebDriverError, 'Switch to desired window before changing its size'
           end
-          execute :set_window_size, {}, {width: width,
-                                       height: height}
+          execute :set_window_rect, {}, {width: width, height: height}
         end
 
-        def maximize_window(handle = :current)
+        def window_size(handle = :current)
           unless handle == :current
-            raise Error::UnsupportedOperationError, 'Switch to desired window before changing its size'
+            raise Error::UnsupportedOperationError, 'Switch to desired window before getting its size'
           end
-          execute :maximize_window
+          data = execute :get_window_rect
+
+          Dimension.new data['width'], data['height']
         end
 
-        def full_screen_window
-          execute :fullscreen_window
+        def minimize_window
+          execute :minimize_window
         end
 
-        def window_size(handle = :current)
+        def maximize_window(handle = :current)
           unless handle == :current
-            raise Error::UnsupportedOperationError, 'Switch to desired window before getting its size'
+            raise Error::UnsupportedOperationError, 'Switch to desired window before changing its size'
           end
-          data = execute :get_window_size
+          execute :maximize_window
+        end
 
-          Dimension.new data['width'], data['height']
+        def full_screen_window
+          execute :fullscreen_window
         end
 
         def reposition_window(x, y)
-          execute :set_window_position, {}, {x: x, y: y}
+          execute :set_window_rect, {}, {x: x, y: y}
         end
 
         def window_position
-          data = execute :get_window_position
+          data = execute :get_window_rect
           Point.new data['x'], data['y']
         end
 
+        def set_window_rect(x: nil, y: nil, width: nil, height: nil)
+          execute :set_window_rect, {}, {x: x, y: y, width: width, height: height}
+        end
+
+        def window_rect
+          data = execute :get_window_rect
+          Rectangle.new data['x'], data['y'], data['width'], data['height']
+        end
+
         def screenshot
           execute :take_screenshot
         end
@@ -415,7 +427,9 @@ module Selenium
 
         # TODO: - Implement file verification
         def send_keys_to_element(element, keys)
-          execute :element_send_keys, {id: element}, {value: keys.join('').split(//)}
+          # Keep .split(//) for backward compatibility for now
+          text = keys.join('')
+          execute :element_send_keys, {id: element}, {value: text.split(//), text: text}
         end
 
         def clear_element(element)
@@ -516,6 +530,12 @@ module Selenium
           Point.new data['x'], data['y']
         end
 
+        def element_rect(element)
+          data = execute :get_element_rect, id: element
+
+          Rectangle.new data['x'], data['y'], data['width'], data['height']
+        end
+
         def element_location_once_scrolled_into_view(element)
           send_keys_to_element(element, [''])
           element_location(element)

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

@@ -54,11 +54,14 @@ module Selenium
             switch_to_window: [:post, 'session/:session_id/window'.freeze],
             get_window_handles: [:get, 'session/:session_id/window/handles'.freeze],
             fullscreen_window: [:post, 'session/:session_id/window/fullscreen'.freeze],
+            minimize_window: [:post, 'session/:session_id/window/minimize'.freeze],
             maximize_window: [:post, 'session/:session_id/window/maximize'.freeze],
             set_window_size: [:post, 'session/:session_id/window/size'.freeze],
             get_window_size: [:get, 'session/:session_id/window/size'.freeze],
             set_window_position: [:post, 'session/:session_id/window/position'.freeze],
             get_window_position: [:get, 'session/:session_id/window/position'.freeze],
+            set_window_rect: [:post, 'session/:session_id/window/rect'.freeze],
+            get_window_rect: [:get, 'session/:session_id/window/rect'.freeze],
             switch_to_frame: [:post, 'session/:session_id/frame'.freeze],
             switch_to_parent_frame: [:post, 'session/:session_id/frame/parent'.freeze],
 

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.3.0'
+  s.version = '3.4.0'
 
   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.3.0
+  version: 3.4.0
 platform: ruby
 authors: 
   - Alex Rodionov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2017-03-07 00:00:00 -06:00
+date: 2017-04-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency