selenium-webdriver 3.0.5 → 3.0.7

data/CHANGES

@@ -1,3 +1,19 @@
+3.0.7 (2016-02-06)
+===================
+
+Firefox:
+  * Fix signature of element arrays returned from #find_elements (issue 3471)
+
+3.0.6 (2016-02-05)
+===================
+
+Firefox:
+  * Implement W3C window position
+  * Update implementation for W3C send text to alert
+  * Implement timeout settings
+  * Remove default capabilities (thanks lmtierney)
+  * Fix signature of elements returned from #execute_script (thanks Thomas Walpole)
+
 3.0.5 (2016-12-27)
 ===================
 

data/README.md

@@ -16,7 +16,7 @@ and has been tested to work on MRI (2.0 through 2.2),
 
 ## License
 
-Copyright 2009-2016 Software Freedom Conservancy
+Copyright 2009-2017 Software Freedom Conservancy
 
 Licensed to the Software Freedom Conservancy (SFC) under one
 or more contributor license agreements.  See the NOTICE file

data/lib/selenium/server.rb

@@ -232,7 +232,9 @@ module Selenium
 
     def process
       @process ||= (
-        cp = ChildProcess.build('java', '-jar', @jar, '-port', @port.to_s, *@additional_args)
+        # extract any additional_args that start with -D as options
+        properties = @additional_args.dup - @additional_args.delete_if { |arg| arg[/^-D/] }
+        cp = ChildProcess.build('java', *properties, '-jar', @jar, '-port', @port.to_s, *@additional_args)
         io = cp.io
 
         if @log.is_a?(String)

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

@@ -40,6 +40,7 @@ module Selenium
           @process       = ChildProcess.build(*server_command)
 
           @process.io.inherit! if $DEBUG
+          @process.leader = true
           @process.start
         end
 

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

@@ -32,7 +32,6 @@ module Selenium
           arg.map { |e| unwrap_script_result(e) }
         when Hash
           element_id = element_id_from(arg)
-          element_id = arg if self.is_a?(Remote::W3CBridge) && element_id
           return Element.new(self, element_id) if element_id
           arg.each { |k, v| arg[k] = unwrap_script_result(v) }
         else

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

@@ -306,7 +306,8 @@ module Selenium
       #
 
       def as_json(*)
-        @id.is_a?(Hash) ? @id : {:ELEMENT => @id}
+        key = bridge.is_a?(Remote::W3CBridge) ? 'element-6066-11e4-a52e-4f735466cecf' : 'ELEMENT'
+        @id.is_a?(Hash) ? @id : {key => @id}
       end
 
       private

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

@@ -77,52 +77,6 @@ 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

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

@@ -56,7 +56,8 @@ module Selenium
         private
 
         def create_capabilities(opts)
-          caps = opts.delete(:desired_capabilities) || Remote::W3CCapabilities.firefox
+          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] || {})
           if opts.key?(:profile)

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

@@ -108,9 +108,6 @@ module Selenium
         end
 
         def create_session(desired_capabilities)
-          # TODO - Remove this when Mozilla fixes bug
-          desired_capabilities[:browser_name] = 'firefox' if desired_capabilities[:browser_name] == 'Firefox'
-
           resp = raw_execute :new_session, {}, {desiredCapabilities: desired_capabilities}
           @session_id = resp['sessionId']
           return W3CCapabilities.json_create resp['value'] if @session_id
@@ -151,7 +148,7 @@ module Selenium
         end
 
         def alert=(keys)
-          execute :send_alert_text, {}, {handler: 'prompt', text: keys}
+          execute :send_alert_text, {}, {value: keys.split(//)}
         end
 
         def alert_text
@@ -257,12 +254,13 @@ module Selenium
           Dimension.new data['width'], data['height']
         end
 
-        def reposition_window(_x, _y, _handle = nil)
-          raise Error::UnsupportedOperationError, 'The W3C standard does not currently support setting the Window Position'
+        def reposition_window(x, y)
+          execute :set_window_position, {}, {x: x, y: y}
         end
 
-        def window_position(_handle = nil)
-          raise Error::UnsupportedOperationError, 'The W3C standard does not currently support getting the Window Position'
+        def window_position
+          data = execute :get_window_position
+          Point.new data['x'], data['y']
         end
 
         def screenshot
@@ -384,7 +382,7 @@ module Selenium
         #
 
         def click_element(element)
-          execute :element_click, id: element.values.first
+          execute :element_click, id: element
         end
 
         def click
@@ -424,11 +422,11 @@ module Selenium
 
         # TODO: - Implement file verification
         def send_keys_to_element(element, keys)
-          execute :element_send_keys, {id: element.values.first}, {value: keys.join('').split(//)}
+          execute :element_send_keys, {id: element}, {value: keys.join('').split(//)}
         end
 
         def clear_element(element)
-          execute :element_clear, id: element.values.first
+          execute :element_clear, id: element
         end
 
         def submit_element(element)
@@ -439,7 +437,7 @@ module Selenium
         end
 
         def drag_element(element, right_by, down_by)
-          execute :drag_element, {id: element.values.first}, {x: right_by, y: down_by}
+          execute :drag_element, {id: element}, {x: right_by, y: down_by}
         end
 
         def touch_single_tap(element)
@@ -500,7 +498,7 @@ module Selenium
         #
 
         def element_tag_name(element)
-          execute :get_element_tag_name, id: element.values.first
+          execute :get_element_tag_name, id: element
         end
 
         def element_attribute(element, name)
@@ -508,7 +506,7 @@ module Selenium
         end
 
         def element_property(element, name)
-          execute :get_element_property, id: element.ref.values.first, name: name
+          execute :get_element_property, id: element.ref, name: name
         end
 
         def element_value(element)
@@ -516,11 +514,11 @@ module Selenium
         end
 
         def element_text(element)
-          execute :get_element_text, id: element.values.first
+          execute :get_element_text, id: element
         end
 
         def element_location(element)
-          data = execute :get_element_rect, id: element.values.first
+          data = execute :get_element_rect, id: element
 
           Point.new data['x'], data['y']
         end
@@ -531,25 +529,25 @@ module Selenium
         end
 
         def element_size(element)
-          data = execute :get_element_rect, id: element.values.first
+          data = execute :get_element_rect, id: element
 
           Dimension.new data['width'], data['height']
         end
 
         def element_enabled?(element)
-          execute :is_element_enabled, id: element.values.first
+          execute :is_element_enabled, id: element
         end
 
         def element_selected?(element)
-          execute :is_element_selected, id: element.values.first
+          execute :is_element_selected, id: element
         end
 
         def element_displayed?(element)
-          execute :is_element_displayed, id: element.values.first
+          execute :is_element_displayed, id: element
         end
 
         def element_value_of_css_property(element, prop)
-          execute :get_element_css_value, id: element.values.first, property_name: prop
+          execute :get_element_css_value, id: element, property_name: prop
         end
 
         #
@@ -566,23 +564,23 @@ module Selenium
           how, what = convert_locators(how, what)
 
           id = if parent
-                 execute :find_child_element, {id: parent.values.first}, {using: how, value: what}
+                 execute :find_child_element, {id: parent}, {using: how, value: what}
                else
                  execute :find_element, {}, {using: how, value: what}
                end
-          Element.new self, id
+          Element.new self, element_id_from(id)
         end
 
         def find_elements_by(how, what, parent = nil)
           how, what = convert_locators(how, what)
 
           ids = if parent
-                  execute :find_child_elements, {id: parent.values.first}, {using: how, value: what}
+                  execute :find_child_elements, {id: parent}, {using: how, value: what}
                 else
                   execute :find_elements, {}, {using: how, value: what}
                 end
 
-          ids.map { |id| Element.new self, id }
+          ids.map { |id| Element.new self, element_id_from(id) }
         end
 
         private

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

@@ -24,27 +24,28 @@ module Selenium
       # Specification of the desired and/or actual capabilities of the browser that the
       # server is being asked to create.
       #
-      class W3CCapabilities
-        DEFAULTS = {
-          browser_name: '',
-          browser_version: :any,
-          platform_name: :any,
-          platform_version: :any,
-          accept_ssl_certs: false,
-          page_load_strategy: 'normal',
-          proxy: nil
-        }.freeze
 
+      # TODO - uncomment when Mozilla fixes this:
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1326397
+      class W3CCapabilities
         KNOWN = [
+          :browser_name,
+          :browser_version,
+          :platform_name,
+          :platform_version,
+          :accept_insecure_certs,
+          :page_load_strategy,
+          :proxy,
           :remote_session_id,
-          :xul_app_id,
-          :raise_accessibility_exceptions,
+          :accessibility_checks,
           :rotatable,
-          :app_build_id,
-          :device
+          :device,
+          :implicit_timeout,
+          :page_load_timeout,
+          :script_timeout,
         ].freeze
 
-        (DEFAULTS.keys + KNOWN).each do |key|
+        KNOWN.each do |key|
           define_method key do
             @capabilities.fetch(key)
           end
@@ -78,7 +79,10 @@ module Selenium
           def firefox(opts = {})
             opts[:browser_version] = opts.delete(:version) if opts.key?(:version)
             opts[:platform_name] = opts.delete(:platform) if opts.key?(:platform)
-
+            opts[:timeouts] = {}
+            opts[:timeouts]['implicit'] = opts.delete(:implicit_timeout) if opts.key?(:implicit_timeout)
+            opts[:timeouts]['page load'] = opts.delete(:page_load_timeout) if opts.key?(:page_load_timeout)
+            opts[:timeouts]['script'] = opts.delete(:script_timeout) if opts.key?(:script_timeout)
             new({browser_name: 'firefox', marionette: true}.merge(opts))
           end
 
@@ -96,32 +100,28 @@ module Selenium
           def json_create(data)
             data = data.dup
 
-            # Convert due to Remote Driver implementation
-            data['browserVersion'] = data.delete('version') if data.key? 'version'
-            data['platformName'] = data.delete('platform') if data.key? 'platform'
-
             caps = new
             caps.browser_name = data.delete('browserName')
             caps.browser_version = data.delete('browserVersion')
             caps.platform_name = data.delete('platformName')
             caps.platform_version = data.delete('platformVersion')
-            caps.accept_ssl_certs = data.delete('acceptSslCerts')
+            caps.accept_insecure_certs = data.delete('acceptInsecureCerts') if data.key?('acceptInsecureCerts')
             caps.page_load_strategy = data.delete('pageLoadStrategy')
+            timeouts = data.delete('timeouts')
+            caps.implicit_timeout = timeouts['implicit'] if timeouts
+            caps.page_load_timeout = timeouts['page load'] if timeouts
+            caps.script_timeout = timeouts['script'] if timeouts
+
             proxy = data.delete('proxy')
             caps.proxy = Proxy.json_create(proxy) unless proxy.nil? || proxy.empty?
 
             # Remote Server Specific
             caps[:remote_session_id] = data.delete('webdriver.remote.sessionid')
 
-            # Obsolete capabilities returned by Remote Server
-            data.delete('javascriptEnabled')
-            data.delete('cssSelectorsEnabled')
-
             # Marionette Specific
-            caps[:xul_app_id] = data.delete('XULappId')
-            caps[:raise_accessibility_exceptions] = data.delete('raisesAccessibilityExceptions')
+            caps[:accessibility_checks] = data.delete('moz:accessibilityChecks')
+            caps[:profile] = data.delete('moz:profile')
             caps[:rotatable] = data.delete('rotatable')
-            caps[:app_build_id] = data.delete('appBuildId')
             caps[:device] = data.delete('device')
 
             # any remaining pairs will be added as is, with no conversion
@@ -135,14 +135,14 @@ module Selenium
         # @option :browser_version          [String] required browser version number
         # @option :platform_name            [Symbol] one of :any, :win, :mac, or :x
         # @option :platform_version         [String] required platform version number
-        # @option :accept_ssl_certs         [Boolean] does the driver accept SSL Cerfifications?
+        # @option :accept_insecure_certs    [Boolean] does the driver accept SSL Cerfifications?
         # @option :proxy                    [Selenium::WebDriver::Proxy, Hash] proxy configuration
         #
         # @api public
         #
 
         def initialize(opts = {})
-          @capabilities = DEFAULTS.merge(opts)
+          @capabilities = opts
           self.proxy = opts.delete(:proxy)
         end
 

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

@@ -57,6 +57,8 @@ module Selenium
             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],
             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.0.5'
+  s.version = '3.0.7'
 
   s.authors = ['Alex Rodionov', 'Titus Fortner']
   s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com']
@@ -26,7 +26,7 @@ HTML of the application.'
   s.add_runtime_dependency 'childprocess', ['~> 0.5']
   s.add_runtime_dependency 'websocket', ['~> 1.0']
 
-  s.add_development_dependency 'rspec', ['~> 3.0']
+  s.add_development_dependency 'rspec', ['< 3.5']
   s.add_development_dependency 'rack', ['~> 1.0']
   s.add_development_dependency 'ci_reporter', ['~> 1.6', '>= 1.6.2']
   s.add_development_dependency 'webmock', ['~> 2.0']

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.5
+  version: 3.0.7
 platform: ruby
 authors: 
   - Alex Rodionov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-12-27 00:00:00 -06:00
+date: 2017-02-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -53,9 +53,9 @@ dependencies:
     requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - <
           - !ruby/object:Gem::Version 
-            version: "3.0"
+            version: "3.5"
     type: :development
     version_requirements: *id004
   - !ruby/object:Gem::Dependency