selenium-webdriver 2.27.2 → 2.29.0

data/CHANGES

@@ -1,3 +1,17 @@
+2.29.0 (2013-01-21)
+===================
+
+Firefox:
+  * Firefox 18 support (for native events).
+IE:
+  * New 'requireWindowFocus' desired capability.
+  * IE view port calculation take scroll bars into account (#3602)
+Safari:
+  * Replace 'libwebsocket' with 'websocket' gem. This should ensure
+    support with recent Safari.
+Other:
+  * Fix Cygwin issue in PortProber/Firefox::Bianry (#4963)
+
 2.27.2 (2012-12-11)
 ===================
 

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

@@ -19,12 +19,15 @@ module Selenium
         port
       end
 
+      IGNORED_ERRORS = [Errno::EADDRNOTAVAIL]
+      IGNORED_ERRORS << Errno::EBADF if Platform.cygwin?
+
       def self.free?(port)
         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
+          rescue *IGNORED_ERRORS => ex
+            $stderr.puts "port prober could not bind to #{host}:#{port} (#{ex.message})" if $DEBUG
             # ignored - some machines appear unable to bind to some of their interfaces
           end
         end

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

@@ -15,7 +15,11 @@ module Selenium
         QUIT_TIMEOUT = 5
 
         def start_with(profile, profile_path, *args)
-          profile_path = profile_path.gsub("/", "\\") if Platform.windows?
+          if Platform.cygwin?
+            profile_path = Platform.cygwin_path(profile_path, :windows => true)
+          elsif Platform.windows?
+            profile_path = profile_path.gsub("/", "\\")
+          end
 
           ENV['XRE_CONSOLE_LOG']           = profile.log_file if profile.log_file
           ENV['XRE_PROFILE_PATH']          = profile_path

data/lib/selenium/webdriver/safari.rb

@@ -1,4 +1,4 @@
-require 'libwebsocket'
+require 'websocket'
 
 module Selenium
   module WebDriver

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

@@ -15,8 +15,8 @@ module Selenium
           @server = Server.new(port, timeout)
           @server.start
 
-          @browser = Browser.new
-          @browser.start(prepare_connect_file)
+          @safari = Browser.new
+          @safari.start(prepare_connect_file)
 
           @server.wait_for_connection
 
@@ -27,7 +27,7 @@ module Selenium
           super
 
           @server.stop
-          @browser.stop
+          @safari.stop
         end
 
         def driver_extensions

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

@@ -6,7 +6,6 @@ module Selenium
         def initialize(port, command_timeout)
           @port  = port
           @command_timeout = command_timeout
-          @frame = LibWebSocket::Frame.new
         end
 
         def start
@@ -22,13 +21,15 @@ module Selenium
           json = WebDriver.json_dump(command)
           puts ">>> #{json}" if $DEBUG
 
-          frame = LibWebSocket::Frame.new(json).to_s
+          frame = WebSocket::Frame::Outgoing::Server.new(:version => @version, :data => json, :type => :text)
 
-          @ws.write frame
+          @ws.write frame.to_s
           @ws.flush
         end
 
         def receive
+          @frame ||= WebSocket::Frame::Incoming::Server.new(:version => @version)
+
           until msg = @frame.next
             end_time = Time.now + @command_timeout
 
@@ -44,12 +45,12 @@ module Selenium
               retry
             end
 
-            @frame.append(data)
+            @frame << data
           end
 
           puts "<<< #{msg}" if $DEBUG
 
-          WebDriver.json_load msg
+          WebDriver.json_load msg.to_s
         end
 
         def ws_uri
@@ -107,29 +108,32 @@ window.onload = function() {
 
         def process_handshake
           @ws = @server.accept
-          hs  = LibWebSocket::OpeningHandshake::Server.new
+          hs  = WebSocket::Handshake::Server.new
 
           req = ''
-          until hs.done?
+          until hs.finished?
             data = @ws.getc || next
+
             req << data.chr
+            hs << data
+          end
 
-            unless hs.parse(data.chr)
-              if req.include? "favicon.ico"
-                @ws.close
-                process_handshake
-                return
-              else
-                raise Error::WebDriverError, "#{hs.error}: #{req}"
-              end
+          unless hs.valid?
+            if req.include? "favicon.ico"
+              @ws.close
+              process_handshake
+              return
+            else
+              raise Error::WebDriverError, "#{hs.error}: #{req}"
             end
           end
 
           @ws.write(hs.to_s)
           @ws.flush
 
-          puts "handshake complete" if $DEBUG
+          puts "handshake complete, v#{hs.version}" if $DEBUG
           @server.close
+          @version = hs.version
         end
       end
 

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.27.2
+  version: 2.29.0
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-11 00:00:00 +01:00
+date: 2013-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -47,14 +47,14 @@ dependencies:
     type: :runtime
     version_requirements: *id003
   - !ruby/object:Gem::Dependency 
-    name: libwebsocket
+    name: websocket
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 0.1.3
+            version: 1.0.4
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency