selenium-webdriver 2.35.1 → 2.37.0

data/CHANGES

@@ -1,3 +1,26 @@
+2.37.0 (2013-10-18)
+===================
+
+* As of this version, selenium-webdriver no longer supports Ruby < 1.9.2
+* Depend on rubyzip ~> 1.0.0
+* Added SOCKS proxy support
+* Fixed support for SVG documents in the atoms.
+* Fixed computing an element's container dimensions to account for  the scrollbar size when scrolling
+* Added Capabilities.htmlunitwithjs
+
+Chrome:
+  * Pass through the prefs option as a Chrome capability (#5929).
+Firefox:
+  * Updated Firefox native event components to support Firefox 24.
+  * New elementScrollBehavior capability.
+  * Fixed getLocation to work on scrolled pages.
+  * Fixed autoscrolling for elements located in frames.
+  * Fixed drag-n-drop for elements in frames with native events
+IE:
+  * Use native events by default, also for remote IE (#4695)
+Safari:
+  * Enable screenshots and input devices in the client.
+  
 2.35.1 (2013-08-26)
 ===================
 

data/README.md

@@ -1,6 +1,6 @@
 # selenium-webdriver
 
-This gem provides Ruby bindings for WebDriver and has been tested to work on MRI (1.8.7 through 2.0), JRuby and Rubinius.
+This gem provides Ruby bindings for WebDriver and has been tested to work on MRI (1.9.2 through 2.1), JRuby and Rubinius.
 
 ## Install
 

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

@@ -61,6 +61,7 @@ module Selenium
           detach                      = opts.delete(:detach)
           proxy                       = opts.delete(:proxy)
           no_website_testing_defaults = opts.delete(:no_website_testing_defaults)
+          prefs                       = opts.delete(:prefs)
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
@@ -89,13 +90,14 @@ module Selenium
           chrome_options['verbose']                  = true if verbose
           chrome_options['detach']                   = detach.nil? || !!detach
           chrome_options['noWebsiteTestingDefaults'] = true if no_website_testing_defaults
+          chrome_options['prefs']                    = prefs if prefs
 
           caps['chromeOptions'] = chrome_options
           caps['proxy'] = proxy if proxy
 
           # legacy options - for chromedriver < 17.0.963.0
           caps["chrome.switches"] = chrome_options['args'] if chrome_options.member?('args')
-          %w[binary detach extensions nativeEvents noWebsiteTestingDefaults profile verbose].each do |key|
+          %w[binary detach extensions nativeEvents noWebsiteTestingDefaults prefs profile verbose].each do |key|
             caps["chrome.#{key}"] = chrome_options[key] if chrome_options.member?(key)
           end
 

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

@@ -47,15 +47,13 @@ module Selenium
       #
 
       def move_to(element, right_by = nil, down_by = nil)
-        unless element.kind_of? Element
-          raise TypeError, "expected #{Element}, got #{element.inspect}:#{element.class}"
-        end
+        assert_element element
 
         @bridge.mouseMoveTo element.ref, right_by, down_by
       end
 
       def move_by(right_by, down_by)
-        @bridge.mouseMoveTo nil, right_by, down_by
+        @bridge.mouseMoveTo nil, Integer(right_by), Integer(down_by)
       end
 
       private
@@ -64,6 +62,11 @@ module Selenium
         move_to element if element
       end
 
+      def assert_element(element)
+        unless element.kind_of? Element
+          raise TypeError, "expected #{Element}, got #{element.inspect}:#{element.class}"
+        end
+      end
     end # Mouse
   end # WebDriver
 end  # Selenium

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

@@ -12,6 +12,9 @@ module Selenium
       attr_reader :type,
                   :ftp,
                   :http,
+                  :socks,
+                  :socks_username,
+                  :socks_password,
                   :no_proxy,
                   :pac,
                   :ssl,
@@ -20,13 +23,16 @@ module Selenium
       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.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}"
@@ -68,6 +74,21 @@ module Selenium
         @auto_detect = bool
       end
 
+      def socks=(value)
+        self.type = :manual
+        @socks = value
+      end
+
+      def socks_username=(value)
+        self.type = :manual
+        @socks_username = value
+      end
+
+      def socks_password=(value)
+        self.type = :manual
+        @socks_password = value
+      end
+
       def type=(type)
         unless TYPES.has_key? type
           raise ArgumentError, "invalid proxy type: #{type.inspect}, expected one of #{TYPES.keys.inspect}"
@@ -91,6 +112,9 @@ module Selenium
         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
 
         json_result if json_result.length > 1
       end
@@ -105,13 +129,16 @@ module Selenium
 
           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.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

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

@@ -45,8 +45,8 @@ module Selenium
       def scroll(*args)
         case args.size
         when 2
-          x, y = args
-          @bridge.touchScroll nil, x, y
+          x_offset, y_offset = args
+          @bridge.touchScroll nil, Integer(x_offset), Integer(y_offset)
         when 3
           element, x_offset, y_offset = args
           assert_element element

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

@@ -1,4 +1,4 @@
-require 'zip/zip'
+require 'zip'
 require 'tempfile'
 require 'find'
 
@@ -18,7 +18,7 @@ module Selenium
           destination = Dir.mktmpdir("webdriver-unzip")
           FileReaper << destination
 
-          Zip::ZipFile.open(path) do |zip|
+          Zip::File.open(path) do |zip|
             zip.each do |entry|
               to      = File.join(destination, entry.name)
               dirname = File.dirname(to)
@@ -62,7 +62,7 @@ module Selenium
           zip_path = File.join(tmp_dir, "webdriver-zip")
 
           begin
-            Zip::ZipFile.open(zip_path, Zip::ZipFile::CREATE, &blk)
+            Zip::File.open(zip_path, Zip::File::CREATE, &blk)
           ensure
             FileUtils.rm_rf tmp_dir
             FileUtils.rm_rf zip_path
@@ -70,7 +70,7 @@ module Selenium
         end
 
         def add_zip_entry(zip, file, entry_name)
-          entry = Zip::ZipEntry.new(zip.name, entry_name)
+          entry = Zip::Entry.new(zip.name, entry_name)
           entry.follow_symlinks = true
 
           zip.add entry, file

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

@@ -156,6 +156,7 @@ module Selenium
             set_manual_proxy_preference "ftp", proxy.ftp
             set_manual_proxy_preference "http", proxy.http
             set_manual_proxy_preference "ssl", proxy.ssl
+            set_manual_proxy_preference "socks", proxy.socks
 
             if proxy.no_proxy
               self["network.proxy.no_proxies_on"] = proxy.no_proxy

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

@@ -458,11 +458,11 @@ module Selenium
 
         def touchScroll(element, x, y)
           if element
-            execute :touchScroll, {}, :xoffset => x, :yoffset => y
-          else
             execute :touchScroll, {}, :element => element,
                                       :xoffset => x,
                                       :yoffset => y
+          else
+            execute :touchScroll, {}, :xoffset => x, :yoffset => y
           end
         end
 

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

@@ -73,12 +73,20 @@ module Selenium
             }.merge(opts))
           end
 
+          def htmlunitwithjs(opts = {})
+            new({
+              :browser_name => "htmlunit",
+              :javascript_enabled => true
+            }.merge(opts))
+          end
+
           def internet_explorer(opts = {})
             new({
               :browser_name          => "internet explorer",
               :platform              => :windows,
               :takes_screenshot      => true,
-              :css_selectors_enabled => true
+              :css_selectors_enabled => true,
+              :native_events         => true
             }.merge(opts))
           end
           alias_method :ie, :internet_explorer
@@ -185,7 +193,7 @@ module Selenium
         end
 
         def merge!(other)
-          if other.respond_to?(:capabilities) && other.capabilities.kind_of?(Hash)
+          if other.respond_to?(:capabilities, true) && other.capabilities.kind_of?(Hash)
             @capabilities.merge! other.capabilities
           elsif other.kind_of? Hash
             @capabilities.merge! other

data/lib/selenium/webdriver/remote/http/default.rb

@@ -119,7 +119,7 @@ module Selenium
                 host == server_url.host || (
                   begin
                     IPAddr.new(host).include?(server_url.host)
-                  rescue ArgumentError
+                  rescue ArgumentError => ex
                     false
                   end
                 )

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

@@ -38,7 +38,10 @@ module Selenium
         end
 
         def driver_extensions
-          []
+          [
+            DriverExtensions::TakesScreenshot,
+            DriverExtensions::HasInputDevices
+          ]
         end
 
         private

data/lib/selenium/webdriver/safari/extension.rb

@@ -94,7 +94,7 @@ module Selenium
             data_dir = Pathname.new(@custom_data_dir || safari_data_dir)
 
             unless data_dir.exist? && data_dir.directory?
-              raise Errno::ENOENT, "Safari data directory not found at #{dir.to_s}"
+              raise Errno::ENOENT, "Safari data directory not found at #{data_dir.to_s}"
             end
 
             data_dir.join('Extensions')

data/lib/selenium/webdriver/safari/resources/client.js

@@ -3746,7 +3746,7 @@ goog.dom.getDocumentScrollElement = function() {
   return goog.dom.getDocumentScrollElement_(document)
 };
 goog.dom.getDocumentScrollElement_ = function(a) {
-  return!goog.userAgent.WEBKIT && goog.dom.isCss1CompatMode_(a) ? a.documentElement : a.body
+  return!goog.userAgent.WEBKIT && goog.dom.isCss1CompatMode_(a) ? a.documentElement : a.body || a.documentElement
 };
 goog.dom.getWindow = function(a) {
   return a ? goog.dom.getWindow_(a) : window
@@ -4672,7 +4672,7 @@ goog.style.getBoundingClientRect_ = function(a) {
   }catch(c) {
     return{left:0, top:0, right:0, bottom:0}
   }
-  goog.userAgent.IE && (a = a.ownerDocument, b.left -= a.documentElement.clientLeft + a.body.clientLeft, b.top -= a.documentElement.clientTop + a.body.clientTop);
+  goog.userAgent.IE && a.ownerDocument.body && (a = a.ownerDocument, b.left -= a.documentElement.clientLeft + a.body.clientLeft, b.top -= a.documentElement.clientTop + a.body.clientTop);
   return b
 };
 goog.style.getOffsetParent = function(a) {
@@ -5041,7 +5041,7 @@ goog.style.getIePixelBorder_ = function(a, b) {
   return c in goog.style.ieBorderWidthKeywords_ ? goog.style.ieBorderWidthKeywords_[c] : goog.style.getIePixelValue_(a, c, "left", "pixelLeft")
 };
 goog.style.getBorderBox = function(a) {
-  if(goog.userAgent.IE) {
+  if(goog.userAgent.IE && !goog.userAgent.isDocumentModeOrHigher(9)) {
     var b = goog.style.getIePixelBorder_(a, "borderLeft"), c = goog.style.getIePixelBorder_(a, "borderRight"), d = goog.style.getIePixelBorder_(a, "borderTop");
     a = goog.style.getIePixelBorder_(a, "borderBottom");
     return new goog.math.Box(d, c, a, b)
@@ -5292,6 +5292,7 @@ bot.userAgent.IE_DOC_PRE10 = goog.userAgent.IE && !goog.userAgent.isDocumentMode
 bot.userAgent.ANDROID_PRE_GINGERBREAD = goog.userAgent.product.ANDROID && !bot.userAgent.isProductVersion(2.3);
 bot.userAgent.ANDROID_PRE_ICECREAMSANDWICH = goog.userAgent.product.ANDROID && !bot.userAgent.isProductVersion(4);
 bot.userAgent.SAFARI_6 = goog.userAgent.product.SAFARI && bot.userAgent.isProductVersion(6);
+bot.userAgent.WINDOWS_PHONE = goog.userAgent.IE && -1 != goog.userAgent.getUserAgentString().indexOf("IEMobile");
 goog.json = {};
 goog.json.isValid_ = function(a) {
   return/^\s*$/.test(a) ? !1 : /^[\],:{}\s\u2028\u2029]*$/.test(a.replace(/\\["\\\/bfnrtu]/g, "@").replace(/"[^"\\\n\r\u2028\u2029\x00-\x08\x0a-\x1f]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]").replace(/(?:^|:|,)(?:[\s\u2028\u2029]*\[)+/g, ""))

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.35.1
+  version: 2.37.0
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-26 00:00:00 +02:00
+date: 2013-10-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - <
+        - - ~>
           - !ruby/object:Gem::Version 
             version: 1.0.0
     type: :runtime
@@ -230,8 +230,8 @@ files:
   - COPYING
 has_rdoc: true
 homepage: http://selenium.googlecode.com
-licenses: []
-
+licenses: 
+  - Apache
 post_install_message: 
 rdoc_options: []