selenium-webdriver 2.24.0 → 2.25.0.rc1

data/CHANGES

@@ -1,3 +1,22 @@
+2.25.0 (2012-07-19)
+===================
+
+* Respect no_proxy / NO_PROXY env vars (#4007).
+* Improve error message if a configured proxy refuses the connection.
+* Ignored exception can be configured on the Wait class.
+* Add Selenium::WebDriver::Support::Color class.
+* Ignore Errno::ENETUNREACH when trying to detect our local IP (#4165).
+* Ignore Errno::EADDRNOTAVAIL in PortProber (#3987).
+* Firefox:
+  * Enumerate through client rects until finding one with non-zero dimensions when clicking.
+  * Updated supported versions of Firefox to 17.
+  * Allow windows to be resized from a frame (#3897).
+  * Fix an issue where a call to submit could hang the driver.
+* IE:
+  * Ability to configure logging through the :log_file and :log_level options.
+  * Increasing stability of file upload dialog handling (#3858)
+* Better handling of overflow edge cases when determining element visibility.
+
 2.24.0 (2012-06-19)
 ===================
 

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

@@ -128,7 +128,13 @@ module Selenium
       alias_method :send_key, :send_keys
 
       #
-      # Clear this element
+      # If this element is a text entry element, this will clear the value. Has no effect on other
+      # elements. Text entry elements are INPUT and TEXTAREA elements.
+      #
+      # Note that the events fired by this event may not be as you'd expect.  In particular, we don't
+      # fire any keyboard or mouse events.  If you want to ensure keyboard events are
+      # fired, consider using #send_keys with the backspace key. To ensure you get a change event, 
+      # consider following with a call to #send_keys with the tab key.
       #
 
       def clear

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

@@ -188,19 +188,11 @@ module Selenium
       ]
 
       # aliased for backwards compatibility
-      ObsoleteElementError = StaleElementReferenceError
-
-      # aliased for backwards compatibility
-      UnhandledError = UnknownError
-
-      # aliased for backwards compatibility
+      ObsoleteElementError      = StaleElementReferenceError
+      UnhandledError            = UnknownError
       UnexpectedJavascriptError = JavascriptError
-
-      # aliased for backwards compatibility
-      NoAlertOpenError = NoAlertPresentError
-
-      # aliased for backwards compatibility
-      ElementNotDisplayedError = ElementNotVisibleError
+      NoAlertOpenError          = NoAlertPresentError
+      ElementNotDisplayedError  = ElementNotVisibleError
 
       class << self
         def for_code(code)

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

@@ -161,13 +161,15 @@ module Selenium
         ensure
           Socket.do_not_reverse_lookup = orig
         end
+      rescue Errno::ENETUNREACH
+        # no external ip
       end
 
       def interfaces
         interfaces = Socket.getaddrinfo("localhost", 8080).map { |e| e[3] }
         interfaces += ["0.0.0.0", Platform.ip]
 
-        interfaces.uniq
+        interfaces.compact.uniq
       end
 
     end # Platform

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

@@ -20,7 +20,15 @@ module Selenium
       end
 
       def self.free?(port)
-        Platform.interfaces.each { |host| TCPServer.new(host, port).close }
+        Platform.interfaces.each do |host|
+          begin
+            TCPServer.new(host, port).close
+          rescue Errno::EADDRNOTAVAIL
+            $stderr.puts "port prober could not bind to #{host}:#{port}" if $DEBUG
+            # ignored - some machines appear unable to bind to some of their interfaces
+          end
+        end
+
         true
       rescue SocketError, Errno::EADDRINUSE
         false

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

@@ -12,11 +12,14 @@ module Selenium
       # @option opts [Numeric] :timeout (5) Seconds to wait before timing out.
       # @option opts [Numeric] :interval (0.2) Seconds to sleep between polls.
       # @option opts [String] :message Exception mesage if timed out.
+      # @option opts [Array, Exception] :ignore Exceptions to ignore while polling (default: Error::NoSuchElementError)
+      #
 
       def initialize(opts = {})
         @timeout  = opts.fetch(:timeout, DEFAULT_TIMEOUT)
         @interval = opts.fetch(:interval, DEFAULT_INTERVAL)
         @message  = opts[:message]
+        @ignored  = Array(opts[:ignore] || Error::NoSuchElementError)
       end
 
 
@@ -35,7 +38,7 @@ module Selenium
           begin
             result = yield
             return result if result
-          rescue Error::NoSuchElementError => last_error
+          rescue *@ignored => last_error
             # swallowed
           end
 

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

@@ -19,11 +19,19 @@ module Selenium
           ignore_mode   = opts.delete(:introduce_flakiness_by_ignoring_security_domains)
           native_events = opts.delete(:native_events) != false
 
+          @server = Server.get
+
+          # get rid of this when the DLL server is gone
+          if @server.respond_to?(:log_level=)
+            # TODO: docs for these options
+            @server.log_level = opts.delete(:log_level)
+            @server.log_file  = opts.delete(:log_file)
+          end
+
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
-          @server = Server.get
           @port = @server.start Integer(port), timeout
 
           caps = Remote::Capabilities.internet_explorer

data/lib/selenium/webdriver/ie/server.rb

@@ -15,11 +15,22 @@ module Selenium
           end
         end
 
-        def initialize(binary_path)
+        attr_accessor :log_level, :log_file
+
+        def initialize(binary_path, opts = {})
           Platform.assert_executable binary_path
 
           @binary_path = binary_path
-          @process     = nil
+          @process = nil
+
+          opts = opts.dup
+          @log_level   = opts.delete(:log_level)
+          @log_file    = opts.delete(:log_file)
+
+          unless opts.empty?
+            raise ArgumentError, "invalid option#{'s' if opts.size != 1}: #{opts.inspect}"
+          end
+
         end
 
         def start(port, timeout)
@@ -27,7 +38,7 @@ module Selenium
 
           @port = port
 
-          @process = ChildProcess.new(@binary_path, "--port=#{@port}")
+          @process = ChildProcess.new(@binary_path, *server_args)
           @process.io.inherit! if $DEBUG
           @process.start
 
@@ -58,6 +69,17 @@ module Selenium
           @process && @process.alive?
         end
 
+        private
+
+        def server_args
+          args = ["--port=#{@port}"]
+
+          args << "--log-level=#{@log_level.to_s.upcase}" if @log_level
+          args << "--log-file=#{@log_file}" if @log_file
+
+          args
+        end
+
       end
     end
   end

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

@@ -50,6 +50,12 @@ module Selenium
               retries += 1
 
               retry
+            rescue Errno::ECONNREFUSED => ex
+              if use_proxy?
+                raise ex.class, "using proxy: #{proxy.http}"
+              else
+                raise
+              end
             end
 
             if response.kind_of? Net::HTTPRedirection
@@ -77,7 +83,7 @@ module Selenium
           end
 
           def new_http_client
-            if proxy
+            if use_proxy?
               unless proxy.respond_to?(:http) && url = @proxy.http
                 raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}"
               end
@@ -94,13 +100,26 @@ module Selenium
           def proxy
             @proxy ||= (
               proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+              no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
+
               if proxy
                 proxy = "http://#{proxy}" unless proxy.start_with?("http://")
-                Proxy.new(:http => proxy)
+                Proxy.new(:http => proxy, :no_proxy => no_proxy)
               end
             )
           end
 
+          def use_proxy?
+            return false if proxy.nil?
+
+            if proxy.no_proxy
+              hosts = proxy.no_proxy.split(",")
+              !(hosts.include?(server_url.host) || hosts.first == "*")
+            else
+              true
+            end
+          end
+
         end # Default
       end # Http
     end # Remote

data/lib/selenium/webdriver/support.rb

@@ -1,4 +1,5 @@
 require 'selenium/webdriver/support/event_firing_bridge'
 require 'selenium/webdriver/support/abstract_event_listener'
 require 'selenium/webdriver/support/block_event_listener'
-require 'selenium/webdriver/support/select'
+require 'selenium/webdriver/support/select'
+require 'selenium/webdriver/support/color'

data/lib/selenium/webdriver/support/color.rb

@@ -0,0 +1,98 @@
+module Selenium
+  module WebDriver
+    module Support
+      class Color
+        RGB_PATTERN      = /^\s*rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)\s*$/
+        RGB_PCT_PATTERN  = /^\s*rgb\(\s*(\d{1,3}|\d{1,2}\.\d+)%\s*,\s*(\d{1,3}|\d{1,2}\.\d+)%\s*,\s*(\d{1,3}|\d{1,2}\.\d+)%\s*\)\s*$/
+        RGBA_PATTERN     = /^\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(0|1|0\.\d+)\s*\)\s*$/
+        RGBA_PCT_PATTERN = /^\s*rgba\(\s*(\d{1,3}|\d{1,2}\.\d+)%\s*,\s*(\d{1,3}|\d{1,2}\.\d+)%\s*,\s*(\d{1,3}|\d{1,2}\.\d+)%\s*,\s*(0|1|0\.\d+)\s*\)\s*$/
+        HEX_PATTERN      = /#([A-Fa-f0-9]{2})([A-Fa-f0-9]{2})([A-Fa-f0-9]{2})/ # \p{XDigit} or \h only works on Ruby 1.9
+        HEX3_PATTERN     = /#([A-Fa-f0-9])([A-Fa-f0-9])([A-Fa-f0-9])/ # \p{XDigit} or \h only works on Ruby 1.9
+        HSL_PATTERN      = /^\s*hsl\(\s*(\d{1,3})\s*,\s*(\d{1,3})%\s*,\s*(\d{1,3})%\s*\)\s*$/
+        HSLA_PATTERN     = /^\s*hsla\(\s*(\d{1,3})\s*,\s*(\d{1,3})%\s*,\s*(\d{1,3})%\s*,\s*(0|1|0\.\d+)\s*\)\s*$/
+
+        attr_reader :red, :green, :blue, :alpha
+
+        def self.from_string(str)
+          case str
+          when RGB_PATTERN
+            new $1, $2, $3
+          when RGB_PCT_PATTERN
+            new(*[$1, $2, $3].map { |e| Float(e) / 100 * 255 })
+          when RGBA_PATTERN
+            new $1, $2, $3, $4
+          when RGBA_PCT_PATTERN
+            new(*[$1, $2, $3].map { |e| Float(e) / 100 * 255 } << $4)
+          when HEX_PATTERN
+            new(*[$1, $2, $3].map { |e| e.to_i(16) })
+          when HEX3_PATTERN
+            new(*[$1, $2, $3].map { |e| (e * 2).to_i(16) })
+          when HSL_PATTERN, HSLA_PATTERN
+            from_hsl($1, $2, $3, $4)
+          else
+            raise ArgumentError, "could not convert #{str.inspect} into color"
+          end
+        end
+
+        def self.from_hsl(h, s, l, a)
+          h = Float(h) / 360
+          s = Float(s) / 100
+          l = Float(l) / 100
+          a = Float(a || 1)
+
+          if s == 0
+            r = l
+            g = r
+            b = r
+          else
+            luminocity2 = (l < 0.5) ? l * (1 + s) : l + s - l * s
+            luminocity1 = 2 * l - luminocity2
+
+            hue_to_rgb = lambda do |lum1, lum2, hue|
+              hue += 1 if hue < 0.0
+              hue -= 1 if hue > 1.0
+
+              if hue < 1.0 / 6.0
+                 (lum1 + (lum2 - lum1) * 6.0 * hue)
+              elsif  hue < 1.0 / 2.0
+                 lum2
+              elsif hue < 2.0 / 3.0
+                lum1 + (lum2 - lum1) * ((2.0 / 3.0) - hue) * 6.0
+              else
+                lum1
+              end
+            end
+
+            r = hue_to_rgb.call(luminocity1, luminocity2, h + 1.0 / 3.0)
+            g = hue_to_rgb.call(luminocity1, luminocity2, h)
+            b = hue_to_rgb.call(luminocity1, luminocity2, h - 1.0 / 3.0)
+          end
+
+          new r * 256, g * 256, b * 256, a
+        end
+
+
+        def initialize(red, green, blue, alpha = 1)
+          @red   = Integer(red)
+          @green = Integer(green)
+          @blue  = Integer(blue)
+          @alpha = Float(alpha)
+        end
+
+        def rgb
+          "rgb(#{red}, #{green}, #{blue})"
+        end
+
+        def rgba
+          a = alpha == 1 ? '1' : alpha
+          "rgba(#{red}, #{green}, #{blue}, #{a})"
+        end
+
+        def hex
+          "#%02x%02x%02x" % [red, green, blue]
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.24.0
+  prerelease: 7
+  version: 2.25.0.rc1
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-20 00:00:00 +02:00
+date: 2012-07-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -213,6 +213,7 @@ files:
   - lib/selenium/webdriver/safari/server.rb
   - lib/selenium/webdriver/support/abstract_event_listener.rb
   - lib/selenium/webdriver/support/block_event_listener.rb
+  - lib/selenium/webdriver/support/color.rb
   - lib/selenium/webdriver/support/event_firing_bridge.rb
   - lib/selenium/webdriver/support/select.rb
   - CHANGES
@@ -236,9 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: