selenium-webdriver 2.20.0 → 2.21.0

data/CHANGES

@@ -1,3 +1,20 @@
+2.21.0 (2012-04-11)
+===================
+
+* Add Selenium::WebDriver::Window#maximize (#3489)
+* Safari:
+  * New driver! See http://code.google.com/p/selenium/wiki/SafariDriver.
+* Firefox:
+  * Significant stability improvements.
+  * Native events support for Firefox 11
+  * Dropped native events support for Firefox 4-9
+  * Window maximize implementation.
+* IE:
+  * Ignore invisible dialogs (#3360).
+  * Window maximize implementation.
+* Android:
+  * Accept SSL certificates (#3504).
+
 2.20.0 (2012-02-28)
 ===================
 

data/lib/selenium/server.rb

@@ -101,6 +101,30 @@ module Selenium
       end
     end
 
+    #
+    # The server port
+    #
+
+    attr_accessor :port
+
+    #
+    # The server timeout
+    #
+
+    attr_accessor :timeout
+
+    #
+    # Whether to launch the server in the background
+    #
+
+    attr_accessor :background
+
+    #
+    # Path to log file, or 'true' for stdout.
+    #
+
+    attr_accessor :log
+
     #
     # @param [String] jar Path to the server jar.
     # @param [Hash] opts the options to create the server process with
@@ -190,7 +214,7 @@ module Selenium
         cp = ChildProcess.build("java", "-jar", @jar, "-port", @port.to_s, *@additional_args)
         io = cp.io
 
-        if @log.kind_of?(String) && !@background
+        if @log.kind_of?(String)
           @log_file = File.open(@log, "w")
           io.stdout = io.stderr = @log_file
         elsif @log

data/lib/selenium/webdriver.rb

@@ -19,6 +19,7 @@ module Selenium
     autoload :IPhone,  'selenium/webdriver/iphone'
     autoload :Opera,   'selenium/webdriver/opera'
     autoload :Remote,  'selenium/webdriver/remote'
+    autoload :Safari,  'selenium/webdriver/safari'
     autoload :Support, 'selenium/webdriver/support'
 
     # @api private

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

@@ -41,6 +41,8 @@ module Selenium
                      IPhone::Bridge.new(opts)
                    when :opera
                      Opera::Bridge.new(opts)
+                   when :safari
+                     Safari::Bridge.new(opts)
                    else
                      raise ArgumentError, "unknown driver: #{browser.inspect}"
                    end

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

@@ -27,17 +27,41 @@ module Selenium
       end
 
       #
-      # Click the element
+      # Click this element. If this causes a new page to load, this method will
+      # attempt to block until the page has loaded.  At this point, you should 
+      # discard all references to this element and any further operations 
+      # performed on this element will raise a StaleElementReferenceError
+      # unless you know that the element and the page will still be present. If
+      # click() causes a new page to be loaded via an event or is done by 
+      # sending a native event then the method will *not* wait for it to be 
+      # loaded and the caller should verify that a new page has been loaded.
       #
-
+      # There are some preconditions for an element to be clicked.  The element
+      # must be visible and it must have a height and width greater then 0.
+      #
+      # Equivalent to:
+      #   driver.action.click(element)
+      #
+      # @example Click on a button
+      #
+      #    driver.find_element(:tag_name, "button").click
+      #
+      # @raise [StaleElementReferenceError] if the element no longer exists as
+      #  defined
+      #
+      
       def click
         bridge.clickElement @id
       end
 
       #
-      # Get the tag name of this element
+      # Get the tag name of the element. 
       #
-      # @return [String]
+      # @example Get the tagname of an INPUT element(returns "input")
+      #
+      #    driver.find_element(:xpath, "//input").tag_name
+      #
+      # @return [String] The tag name of this element.
       #
 
       def tag_name

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

@@ -90,6 +90,14 @@ module Selenium
         @bridge.setWindowPosition Integer(x), Integer(y)
       end
 
+      #
+      # Maximize the current window
+      #
+
+      def maximize
+        @bridge.maximizeWindow
+      end
+
 
     end
   end

data/lib/selenium/webdriver/firefox/extension/prefs.json

@@ -21,9 +21,7 @@
     "extensions.logging.enabled": true,
     "extensions.update.enabled": false,
     "extensions.update.notifyUser": false,
-    "focusmanager.testmode": true,
     "network.manage-offline-status": false,
-    "network.http.max-connections-per-server": 10,
     "network.http.phishy-userpass-length": 255,
     "offline-apps.allow_by_default": true,
     "prompts.tab_modal.enabled": false,
@@ -51,6 +49,7 @@
     "dom.max_script_run_time": 30,
     "dom.report_all_js_exceptions": true,
     "javascript.options.showInConsole": true,
+    "network.http.max-connections-per-server": 10,
     "webdriver_accept_untrusted_certs": true,
     "webdriver_assume_untrusted_issuer": true
   }

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

@@ -16,25 +16,26 @@ module Selenium
           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)
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
           @server = Server.new
-          @port   = @server.start Integer(port)
+          @port = @server.start Integer(port), timeout
 
-          host = Platform.localhost
-          unless SocketPoller.new(host, @port, timeout).connected?
-            raise Error::WebDriverError, "unable to connect to IE server within #{timeout} seconds"
+          caps = Remote::Capabilities.internet_explorer
+          if ignore_mode
+            caps['ignoreProtectedModeSettings'] = true
           end
 
           remote_opts = {
-            :url => "http://#{host}:#{@port}",
-            :desired_capabilities => :internet_explorer
+            :url => @server.uri,
+            :desired_capabilities => caps
           }
 
-          remote_opts.merge!(:http_client => http_client) if http_client
+          remote_opts[:http_client] = http_client if http_client
 
           super(remote_opts)
         end

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

@@ -31,10 +31,14 @@ module Selenium
         # Starts the server, communicating on the specified port, if it is not already running
         #
 
-        def start(start_port)
+        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
 
@@ -52,6 +56,10 @@ module Selenium
           self.class.current_port
         end
 
+        def uri
+          "http://#{Platform.localhost}:#{port}"
+        end
+
         private
 
         def session_count

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

@@ -104,7 +104,7 @@ module Selenium
         end
 
         def setImplicitWaitTimeout(milliseconds)
-          execute :setImplicitWaitTimeout, {}, :ms => milliseconds
+          execute :implicitlyWait, {}, :ms => milliseconds
         end
 
         def setScriptTimeout(milliseconds)
@@ -217,6 +217,10 @@ module Selenium
                                    :height => height
         end
 
+        def maximizeWindow(handle = :current)
+          execute :maximizeWindow, :window_handle => handle
+        end
+
         def getWindowSize(handle = :current)
           data = execute :getWindowSize, :window_handle => handle
 
@@ -335,11 +339,11 @@ module Selenium
         end
 
         def deleteCookie(name)
-          execute :deleteCookieNamed, :name => name
+          execute :deleteCookie, :name => name
         end
 
         def getAllCookies
-          execute :getAllCookies
+          execute :getCookies
         end
 
         def deleteAllCookies
@@ -562,7 +566,7 @@ module Selenium
         end
 
         #
-        # executes a command on the remote server via the REST / JSON API.
+        # executes a command on the remote server.
         #
         #
         # Returns the 'value' of the returned payload
@@ -573,7 +577,7 @@ module Selenium
         end
 
         #
-        # executes a command on the remote server via the REST / JSON API.
+        # executes a command on the remote server.
         #
         # @return [WebDriver::Remote::Response]
         #

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

@@ -108,6 +108,15 @@ module Selenium
             }.merge(opts))
           end
 
+          def safari(opts = {})
+            new({
+              :browser_name          => "safari",
+              :javascript_enabled    => true,
+              :takes_screenshot      => true,
+              :css_selectors_enabled => true
+            }.merge(opts))
+          end
+
           #
           # @api private
           #

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

@@ -37,6 +37,7 @@ class Selenium::WebDriver::Remote::Bridge
   command :setWindowPosition,                      :post,    "session/:session_id/window/:window_handle/position"
   command :getWindowSize,                          :get,     "session/:session_id/window/:window_handle/size"
   command :getWindowPosition,                      :get,     "session/:session_id/window/:window_handle/position"
+  command :maximizeWindow,                         :post,    "session/:session_id/window/:window_handle/maximize"
 
   #
   # script execution
@@ -71,16 +72,16 @@ class Selenium::WebDriver::Remote::Bridge
   # options
   #
 
-  command :getAllCookies,                          :get,     "session/:session_id/cookie"
+  command :getCookies,                             :get,     "session/:session_id/cookie"
   command :addCookie,                              :post,    "session/:session_id/cookie"
   command :deleteAllCookies,                       :delete,  "session/:session_id/cookie"
-  command :deleteCookieNamed,                      :delete,  "session/:session_id/cookie/:name"
+  command :deleteCookie,                           :delete,  "session/:session_id/cookie/:name"
 
   #
   # timeouts
   #
 
-  command :setImplicitWaitTimeout,                 :post,    "session/:session_id/timeouts/implicit_wait"
+  command :implicitlyWait,                         :post,    "session/:session_id/timeouts/implicit_wait"
   command :setScriptTimeout,                       :post,    "session/:session_id/timeouts/async_script"
   command :setTimeout,                             :post,    "session/:session_id/timeouts"
 

data/lib/selenium/webdriver/safari.rb

@@ -0,0 +1,41 @@
+require 'libwebsocket'
+
+module Selenium
+  module WebDriver
+    module Safari
+
+      class << self
+        def path=(path)
+          Platform.assert_executable(path)
+          @path = path
+        end
+
+        def path
+          @path ||= (
+            path = case Platform.os
+            when :windows
+              # TODO: improve this
+              File.join(ENV['ProgramFiles'], 'Safari', 'Safari.exe')
+            when :macosx
+              "/Applications/Safari.app/Contents/MacOS/Safari"
+            else
+              Platform.find_binary("Safari")
+            end
+
+            unless File.file?(path) && File.executable?(path)
+              raise Error::WebDriverError, "unable to find the Safari executable, please set Selenium::WebDriver::Safari.path= or add it to your PATH."
+            end
+
+            path
+          )
+        end
+      end
+
+    end
+  end
+end
+
+require 'selenium/webdriver/safari/browser'
+require 'selenium/webdriver/safari/server'
+require 'selenium/webdriver/safari/bridge'
+

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

@@ -0,0 +1,96 @@
+module Selenium
+  module WebDriver
+    module Safari
+
+      class Bridge < Remote::Bridge
+        COMMAND_TIMEOUT = 60
+
+        def initialize(opts = {})
+          port = Integer(opts[:port] || PortProber.random)
+          timeout = Integer(opts[:timeout] || COMMAND_TIMEOUT)
+
+          @command_id ||= 0
+
+          @server = Server.new(port, timeout)
+          @server.start
+
+          @browser = Browser.new
+          @browser.start(prepare_connect_file)
+
+          @server.wait_for_connection
+
+          super(:desired_capabilities => :safari)
+        end
+
+        def quit
+          super
+
+          @server.stop
+          @browser.stop
+        end
+
+        def driver_extensions
+          []
+        end
+
+        private
+
+        def create_session(desired_capabilities)
+          resp = raw_execute :newSession, {}, :desiredCapabilities => desired_capabilities
+          Remote::Capabilities.json_create resp.fetch('value')
+        end
+
+        def raw_execute(command, opts = {}, command_hash = nil)
+          @command_id += 1
+
+          params = {}
+          opts.each do |key, value|
+            params[camel_case(key.to_s)] = value
+          end
+
+          params.merge!(command_hash) if command_hash
+
+          @server.send :id         => @command_id.to_s,
+                       :name       => command,
+                       :parameters => params
+
+          response = @server.receive
+
+          status_code = response['status']
+          if status_code != 0
+            raise Error.for_code(status_code), response['value']['message']
+          end
+
+          if response['id'] != @command_id.to_s
+            raise Error::WebDriverError, "response id does not match command id"
+          end
+
+          response
+        end
+
+        def camel_case(str)
+          parts = str.split('_')
+          parts[1..-1].map { |e| e.capitalize! }
+
+          parts.join
+        end
+
+        def prepare_connect_file
+          # TODO: use tempfile?
+          path = File.join(Dir.tmpdir, "safaridriver-#{Time.now.to_i}.html")
+
+          File.open(path, 'w') do |io|
+            io << "<!DOCTYPE html><script>window.location = '#{@server.uri}';</script>"
+          end
+
+          FileReaper << path
+          path.gsub! "/", "\\" if Platform.windows?
+
+          path
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Selenium
+  module WebDriver
+    module Safari
+
+      class Browser
+        def start(*args)
+          @process = ChildProcess.new(Safari.path, *args)
+          @process.io.inherit! if $DEBUG
+          @process.start
+        end
+
+        def stop
+          @process.stop if @process
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,138 @@
+module Selenium
+  module WebDriver
+    module Safari
+
+      class Server
+        def initialize(port, command_timeout)
+          @port  = port
+          @command_timeout = command_timeout
+          @frame = LibWebSocket::Frame.new
+        end
+
+        def start
+          @server = TCPServer.new(Platform.localhost, @port)
+        end
+
+        def stop
+          @server.close if @server && !@server.closed?
+          @ws.close if @ws && !@ws.closed?
+        end
+
+        def send(command)
+          json = MultiJson.encode(command)
+          puts ">>> #{json}" if $DEBUG
+
+          frame = LibWebSocket::Frame.new(json).to_s
+
+          @ws.write frame
+          @ws.flush
+        end
+
+        def receive
+          until msg = @frame.next
+            end_time = Time.now + @command_timeout
+
+            begin
+              data = @ws.read_nonblock(1)
+            rescue Errno::EWOULDBLOCK, Errno::EAGAIN
+              now = Time.now
+              if now >= end_time
+                raise Error::TimeOutError, "timed out waiting for Safari to respond"
+              end
+
+              IO.select([@ws], nil, nil, end_time - now)
+              retry
+            end
+
+            @frame.append(data)
+          end
+
+          puts "<<< #{msg}" if $DEBUG
+
+          MultiJson.decode msg
+        end
+
+        def ws_uri
+          "ws://#{Platform.localhost}:#{@port}/wd"
+        end
+
+        def uri
+          "http://#{Platform.localhost}:#{@port}"
+        end
+
+        def wait_for_connection
+          # TODO: timeouts / non-blocking accept
+          process_initial_http_request
+          process_handshake
+        end
+
+        HEADERS = <<-HEADERS
+HTTP/1.1 200 OK
+Content-Type: text/html; charset=utf-8
+Server: safaridriver-ruby
+        HEADERS
+
+        HEADERS.gsub!("\n", "\r\n")
+
+        HTML = <<-HTML
+<!DOCTYPE html>
+<h2>SafariDriver requesting connection at %s</h2>
+<script>
+// Must wait for onload so the injected script is loaded by the
+// SafariDriver extension.
+window.onload = function() {
+  window.postMessage({
+    'message': 'connect',
+    'source': 'webdriver',
+    'url': '%s'
+  }, '*');
+};
+</script>
+        HTML
+
+        def process_initial_http_request
+          http = @server.accept
+
+          req = ''
+          until req.include?("\r\n\r\n")
+            req << http.read(1)
+          end
+
+          http << HEADERS
+          http << "\r\n\r\n"
+          http << HTML % [ws_uri, ws_uri]
+
+          http.close
+        end
+
+        def process_handshake
+          @ws = @server.accept
+          hs  = LibWebSocket::OpeningHandshake::Server.new
+
+          req = ''
+          until hs.done?
+            data = @ws.getc || next
+            req << data.chr
+
+            unless hs.parse(data.chr)
+              if req.include? "favicon.ico"
+                @ws.close
+                process_handshake
+                return
+              else
+                raise Error::WebDriverError, "#{hs.error}: #{req}"
+              end
+            end
+          end
+
+          @ws.write(hs.to_s)
+          @ws.flush
+
+          puts "handshake complete" if $DEBUG
+          @server.close
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.20.0
+  version: 2.21.0
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-28 00:00:00 -08:00
+date: 2012-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -58,49 +58,60 @@ dependencies:
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: libwebsocket
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.1.3
+    type: :runtime
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.0"
     type: :development
-    version_requirements: *id005
+    version_requirements: *id006
   - !ruby/object:Gem::Dependency 
     name: rack
     prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
+    requirement: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "1.0"
     type: :development
-    version_requirements: *id006
+    version_requirements: *id007
   - !ruby/object:Gem::Dependency 
     name: ci_reporter
     prerelease: false
-    requirement: &id007 !ruby/object:Gem::Requirement 
+    requirement: &id008 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.6.2
     type: :development
-    version_requirements: *id007
+    version_requirements: *id008
   - !ruby/object:Gem::Dependency 
     name: webmock
     prerelease: false
-    requirement: &id008 !ruby/object:Gem::Requirement 
+    requirement: &id009 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.7.5
     type: :development
-    version_requirements: *id008
+    version_requirements: *id009
 description: WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.
 email: jari.bakken@gmail.com
 executables: []
@@ -135,6 +146,7 @@ files:
   - lib/selenium/webdriver/iphone.rb
   - lib/selenium/webdriver/opera.rb
   - lib/selenium/webdriver/remote.rb
+  - lib/selenium/webdriver/safari.rb
   - lib/selenium/webdriver/support.rb
   - lib/selenium/webdriver/android/bridge.rb
   - lib/selenium/webdriver/chrome/bridge.rb
@@ -208,6 +220,9 @@ files:
   - lib/selenium/webdriver/remote/http/curb.rb
   - lib/selenium/webdriver/remote/http/default.rb
   - lib/selenium/webdriver/remote/http/persistent.rb
+  - lib/selenium/webdriver/safari/bridge.rb
+  - lib/selenium/webdriver/safari/browser.rb
+  - 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/event_firing_bridge.rb