selenium-webdriver 2.22.0.rc1 → 2.22.0.rc2

data/CHANGES

@@ -1,7 +1,23 @@
-2.22.0 (???)
+2.22.0
 ============
 
 * Fix conflict with ActiveSupport's Object#load (#3819)
+* IE:
+  * standalone server executable, falls back to bundled DLLs.
+* Firefox:
+  * Native events for Firefox 12.
+  * Native events retained for Firefox 3.x, 10 and 11.
+  * Fix for typing in Firefox 12
+  * Fix for typing on XHTML pages (#3647)
+  * Fix for maximizing windows when switched to a frame (#3758)
+  * Handle alerts from nested iframes (#3825)
+* Element#attribute returns nil if a boolean attribute is not present.
+* NoSuchWindowError will be thrown if the currently selected
+    window is closed and another command is sent
+* Safari:
+  * support for frame switching, snapshot taking, execute script
+  * message protocol changed, not backwards compatible with 2.21.
+* Style attributes are no longer lower-cased by default (#1089).
 
 2.21.2 (2012-04-18)
 ===================

data/lib/selenium/server.rb

@@ -184,9 +184,10 @@ module Selenium
     private
 
     def self.net_http
-      if ENV['http_proxy']
-        http_proxy = ENV['http_proxy']
-        http_proxy = "http://#{http_proxy}" unless http_proxy =~ /^http:\/\//i
+      http_proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+
+      if http_proxy
+        http_proxy = "http://#{http_proxy}" unless http_proxy.start_with?("http://")
         uri = URI.parse(http_proxy)
 
         Net::HTTP::Proxy(uri.host, uri.port)

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

@@ -9,6 +9,7 @@ module Selenium
       class Service
         START_TIMEOUT = 20
         STOP_TIMEOUT  = 5
+        DEFAULT_PORT  = 9515
         MISSING_TEXT  = "Unable to find the chromedriver executable. Please download the server from http://code.google.com/p/chromedriver/downloads/list and place it somewhere on your PATH. More info at http://code.google.com/p/selenium/wiki/ChromeDriver."
 
         attr_reader :uri
@@ -29,7 +30,7 @@ module Selenium
         end
 
         def self.default_service
-          new executable_path, PortProber.random
+          new executable_path, PortProber.above(DEFAULT_PORT)
         end
 
         def initialize(executable_path, port)

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

@@ -5,21 +5,30 @@ module Selenium
         port += 1 until free? port
         port
       end
-      
+
       def self.random
+        # TODO: Avoid this
+        #
+        # (a) should pick a port that's guaranteed to be free on all interfaces
+        # (b) should pick a random port outside the ephemeral port range
+        #
         server = TCPServer.new(Platform.localhost, 0)
         port   = server.addr[1]
         server.close
-        
+
         port
       end
-      
+
       def self.free?(port)
-        TCPServer.new(Platform.localhost, port).close
+        interfaces = Socket.getaddrinfo("localhost", port).map { |e| e[2] }
+        interfaces += ["0.0.0.0", Platform.ip]
+        interfaces.each { |address| TCPServer.new(address, port).close }
+
         true
       rescue SocketError, Errno::EADDRINUSE
         false
       end
+
     end # PortProber
   end # WebDriver
 end # Selenium

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

@@ -81,12 +81,12 @@ module Selenium
       end
 
       def with_timeout(&blk)
-        max_time = Time.now + @timeout
+        max_time = time_now + @timeout
 
         (
           return true if yield
           wait
-        ) until Time.now > max_time
+        ) until time_now > max_time
 
         false
       end
@@ -95,6 +95,11 @@ module Selenium
         sleep @interval
       end
 
+      # for testability
+      def time_now
+        Time.now
+      end
+
     end # SocketPoller
   end # WebDriver
 end # Selenium

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

@@ -15,7 +15,7 @@ module Selenium
       class << self
 
         def unzip(path)
-          destination = Dir.mktmpdir("unzip")
+          destination = Dir.mktmpdir("webdriver-unzip")
           FileReaper << destination
 
           Zip::ZipFile.open(path) do |zip|

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

@@ -13,16 +13,17 @@ module Selenium
         DEFAULT_TIMEOUT = 30
 
         def initialize(opts = {})
-          timeout     = opts.delete(:timeout) { DEFAULT_TIMEOUT }
-          port        = opts.delete(:port) { DEFAULT_PORT }
-          http_client = opts.delete(:http_client)
-          ignore_mode = opts.delete(:introduce_flakiness_by_ignoring_security_domains)
+          timeout       = opts.delete(:timeout) { DEFAULT_TIMEOUT }
+          port          = opts.delete(:port) { PortProber.above(DEFAULT_PORT) }
+          http_client   = opts.delete(:http_client)
+          ignore_mode   = opts.delete(:introduce_flakiness_by_ignoring_security_domains)
+          native_events = opts.delete(:native_events) != false
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
-          @server = Server.new
+          @server = Server.get
           @port = @server.start Integer(port), timeout
 
           caps = Remote::Capabilities.internet_explorer
@@ -30,6 +31,8 @@ module Selenium
             caps['ignoreProtectedModeSettings'] = true
           end
 
+          caps['nativeEvents'] = native_events
+
           remote_opts = {
             :url => @server.uri,
             :desired_capabilities => caps
@@ -50,9 +53,9 @@ module Selenium
 
         def quit
           super
-          @server.stop
-
           nil
+        ensure
+          @server.stop
         end
 
       end # Bridge

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

@@ -0,0 +1,72 @@
+module Selenium
+  module WebDriver
+    module IE
+
+      #
+      # @api private
+      #
+
+      class InProcessServer
+        extend FFI::Library
+
+        if Platform.bitsize == 64
+          ffi_lib WebDriver::IE::DLLS[:x64]
+        else
+          ffi_lib WebDriver::IE::DLLS[:win32]
+        end
+
+        ffi_convention :stdcall
+
+        attach_function :start_server,  :StartServer,           [:int],     :pointer
+        attach_function :stop_server,   :StopServer,            [:pointer], :void
+        attach_function :session_count, :GetServerSessionCount, [],         :int
+        attach_function :current_port,  :GetServerPort,         [],         :int
+        attach_function :is_running,    :ServerIsRunning,       [],         :bool
+
+        def initialize
+          @handle = nil
+        end
+
+        #
+        # Starts the server, communicating on the specified port, if it is not already running
+        #
+
+        def start(start_port, timeout)
+          return port if running?
+          @handle = self.class.start_server(start_port)
+
+          unless SocketPoller.new(Platform.localhost, start_port, timeout).connected?
+            raise Error::WebDriverError, "unable to connect to IE server within #{timeout} seconds"
+          end
+
+          start_port
+        end
+
+        def stop
+          return if session_count != 0 || @handle.nil?
+          self.class.stop_server @handle
+          @handle = nil
+        end
+
+        def running?
+          self.class.is_running
+        end
+
+        def port
+          self.class.current_port
+        end
+
+        def uri
+          "http://#{Platform.localhost}:#{port}"
+        end
+
+        private
+
+        def session_count
+          self.class.session_count
+        end
+
+      end # Server
+    end # IE
+  end # WebDriver
+end # Selenium

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

@@ -1,72 +1,65 @@
 module Selenium
   module WebDriver
     module IE
-
-      #
-      # @api private
-      #
-
       class Server
-        extend FFI::Library
 
-        if Platform.bitsize == 64
-          ffi_lib WebDriver::IE::DLLS[:x64]
-        else
-          ffi_lib WebDriver::IE::DLLS[:win32]
-        end
+        STOP_TIMEOUT = 5
 
-        ffi_convention :stdcall
+        def self.get
+          binary = Platform.find_binary("IEDriverServer")
+          if binary
+            new(binary)
+          else
+            # TODO: deprecation warning
+            require 'selenium/webdrier/ie/in_process_server'
+            InProcessServer.new
+          end
+        end
 
-        attach_function :start_server,  :StartServer,           [:int],     :pointer
-        attach_function :stop_server,   :StopServer,            [:pointer], :void
-        attach_function :session_count, :GetServerSessionCount, [],         :int
-        attach_function :current_port,  :GetServerPort,         [],         :int
-        attach_function :is_running,    :ServerIsRunning,       [],         :bool
+        def initialize(binary_path)
+          Platform.assert_executable binary_path
 
-        def initialize
-          @handle = nil
+          @binary_path = binary_path
+          @process     = nil
         end
 
-        #
-        # Starts the server, communicating on the specified port, if it is not already running
-        #
+        def start(port, timeout)
+          return @port if running?
+
+          @port = port
 
-        def start(start_port, timeout)
-          return port if running?
-          @handle = self.class.start_server(start_port)
+          @process = ChildProcess.new(@binary_path, "--port=#{@port}")
+          @process.io.inherit! if $DEBUG
+          @process.start
 
-          unless SocketPoller.new(Platform.localhost, start_port, timeout).connected?
+          unless SocketPoller.new(Platform.localhost, @port, timeout).connected?
             raise Error::WebDriverError, "unable to connect to IE server within #{timeout} seconds"
           end
 
-          start_port
-        end
+          Platform.exit_hook { stop }
 
-        def stop
-          return if session_count != 0 || @handle.nil?
-          self.class.stop_server @handle
-          @handle = nil
+          @port
         end
 
-        def running?
-          self.class.is_running
+        def stop
+          if running?
+            @process.stop STOP_TIMEOUT
+          end
         end
 
         def port
-          self.class.current_port
+          @port
         end
 
         def uri
           "http://#{Platform.localhost}:#{port}"
         end
 
-        private
-
-        def session_count
-          self.class.session_count
+        def running?
+          @process && @process.alive?
         end
 
-      end # Server
-    end # IE
-  end # WebDriver
-end # Selenium
+      end
+    end
+  end
+end

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

@@ -25,7 +25,7 @@ module Selenium
         end
 
         def initialize(jar, opts = {})
-          opts.merge! :background => true, :port => PortProber.random
+          opts.merge! :background => true, :port => PortProber.above(4444)
           opts.merge! :log => !!$DEBUG if $DEBUG
           @server = Selenium::Server.new File.expand_path(jar), opts
         end

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

@@ -13,7 +13,6 @@ module Selenium
 
           def initialize
             super
-            @proxy = nil
           end
 
           def http
@@ -82,10 +81,11 @@ module Selenium
           end
 
           def new_http_client
-            if @proxy
-              unless @proxy.respond_to?(:http) && url = @proxy.http
+            if proxy
+              unless proxy.respond_to?(:http) && url = @proxy.http
                 raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}"
               end
+
               proxy = URI.parse(url)
 
               clazz = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password)
@@ -95,6 +95,16 @@ module Selenium
             end
           end
 
+          def proxy
+            @proxy ||= (
+              proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+              if proxy
+                proxy = "http://#{proxy}" unless proxy.start_with?("http://")
+                Proxy.new(:http => proxy)
+              end
+            )
+          end
+
         end # Default
       end # Http
     end # Remote

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

@@ -5,6 +5,7 @@ module Selenium
       class Bridge < Remote::Bridge
         COMMAND_TIMEOUT = 60
 
+
         def initialize(opts = {})
           port = Integer(opts[:port] || PortProber.random)
           timeout = Integer(opts[:timeout] || COMMAND_TIMEOUT)

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 2.22.0.rc1
+  version: 2.22.0.rc2
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-01 00:00:00 +02:00
+date: 2012-05-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -206,6 +206,7 @@ files:
   - lib/selenium/webdriver/firefox/native/linux/amd64/x_ignore_nofocus.so
   - lib/selenium/webdriver/firefox/native/linux/x86/x_ignore_nofocus.so
   - lib/selenium/webdriver/ie/bridge.rb
+  - lib/selenium/webdriver/ie/in_process_server.rb
   - lib/selenium/webdriver/ie/server.rb
   - lib/selenium/webdriver/ie/native/win32/IEDriver.dll
   - lib/selenium/webdriver/ie/native/x64/IEDriver.dll