selenium-webdriver 0.1.2 → 0.1.3.dev

data/CHANGES

@@ -1,4 +1,21 @@
-0.1.2 (2010-12-??)
+0.1.3 (???)
+============
+
+* Screenshot support in the IE and Remote drivers.
+* Fixed paths for IE DLLs on Cygwin.
+* Several crashing bugs fixed in the IE driver.
+* Fix #1152 by avoiding IPv6 loopback.
+* Added Mouse and Keyboard classes, accessible as Driver#{mouse,keyboard}. Considered experimental (IE + HtmlUnit only at the moment).
+* Automation atoms now used extensively in the IE driver.
+* Firefox::Bridge is now easier to extend (i.e. with a custom launcher).
+* Add S::W::Remote::Http::Persistent (currently only usable with the remote server).
+* IE driver passes along options like the other remote drivers, enabling user-specified HTTP clients.
+* :firefox_profile added to Remote::Capabilities, enabling passing a profile to remote Firefoxes.
+* IE driver now supports launching multiple instances of the browser.
+* Remove some Ruby warnings (uninitialized ivars, URI.escape).
+
+
+0.1.2 (2010-12-22)
 ============
 
 * Changed frame switching behaviour (http://groups.google.com/group/selenium-developers/browse_thread/thread/8dc7938c35bb3968)

data/lib/selenium/client/legacy_driver.rb

@@ -1334,6 +1334,15 @@ module Selenium
         end
 
 
+        # Returns the number of nodes that match the specified css selector, eg. "css=table" would give
+        # the number of tables.
+        #
+        # 'css' is the css selector to evaluate. do NOT wrap this expression in a 'count()' function; we will do that for you.
+        def get_css_count(css)
+            return number_command("getCssCount", [css,])
+        end
+
+
         # Temporarily sets the "id" attribute of the specified element, so you can locate it in the future
         # using its ID rather than a slow/complicated XPath.  This ID will disappear once the page is
         # reloaded.

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

@@ -3,7 +3,7 @@ module Selenium
     module Android
       class Bridge < Remote::Bridge
 
-        DEFAULT_URL = "http://localhost:8080/hub"
+        DEFAULT_URL = "http://#{Platform.localhost}:8080/hub"
 
         def initialize(opts = nil)
           if opts

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

@@ -37,10 +37,6 @@ module Selenium
           @launcher.quit
         end
 
-        def getScreenshot
-          execute :screenshot
-        end
-
         def setSpeed(value)
           @speed = value
         end

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

@@ -46,13 +46,13 @@ module Selenium
         end
 
         def uri
-          "http://localhost:#{port}/chromeCommandExecutor"
+          "http://#{Platform.localhost}:#{port}/chromeCommandExecutor"
         end
 
         private
 
         def localhost
-          Platform.ironruby? ? "localhost" : "0.0.0.0" # yeah, weird..
+          Platform.ironruby? ? Platform.localhost : "0.0.0.0" # yeah, weird..
         end
 
         def start_run_loop

data/lib/selenium/webdriver/common.rb

@@ -8,6 +8,8 @@ require "selenium/webdriver/common/socket_poller"
 require "selenium/webdriver/common/zipper"
 require "selenium/webdriver/common/wait"
 require "selenium/webdriver/common/alert"
+require "selenium/webdriver/common/mouse"
+require "selenium/webdriver/common/keyboard"
 require "selenium/webdriver/common/target_locator"
 require "selenium/webdriver/common/navigation"
 require "selenium/webdriver/common/timeouts"
@@ -15,6 +17,7 @@ require "selenium/webdriver/common/options"
 require "selenium/webdriver/common/find"
 require "selenium/webdriver/common/driver_extensions/takes_screenshot"
 require "selenium/webdriver/common/driver_extensions/rotatable"
+require "selenium/webdriver/common/driver_extensions/has_input_devices"
 require "selenium/webdriver/common/keys"
 require "selenium/webdriver/common/bridge_helper"
 require "selenium/webdriver/common/driver"

data/lib/selenium/webdriver/common/driver_extensions/has_input_devices.rb

@@ -0,0 +1,22 @@
+module Selenium
+  module WebDriver
+
+    #
+    # @api private
+    #
+
+    module DriverExtensions
+      module HasInputDevices
+
+        def mouse
+          Mouse.new @bridge
+        end
+
+        def keyboard
+          Keyboard.new @bridge
+        end
+
+      end # HasInputDevices
+    end # DriverExtensions
+  end # WebDriver
+end # Selenium

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

@@ -213,6 +213,16 @@ module Selenium
         bridge.getElementLocation @id
       end
 
+      #
+      # Determine an element's location on the screen once it has been scrolled into view.
+      #
+      # @return [WebDriver::Point]
+      #
+
+      def location_once_scrolled_into_view
+        bridge.getElementLocationOnceScrolledIntoView @id
+      end
+
       #
       # Get the size of this element
       #

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

@@ -0,0 +1,48 @@
+module Selenium
+  module WebDriver
+    class Keyboard
+
+      def initialize(bridge)
+        @bridge = bridge
+      end
+
+      def send_keys(*keys)
+        @bridge.getActiveElement.send_keys(*keys)
+      end
+
+      #
+      # Release a modifier key
+      #
+      # @see Selenium::WebDriver::Keys
+      #
+
+      def press(key)
+        assert_modifier key
+        @bridge.sendModifierKeyToActiveElement Keys[key], true
+      end
+
+      #
+      # Release a modifier key
+      #
+      # @see Selenium::WebDriver::Keys
+      #
+
+      def release(key)
+        assert_modifier key
+        @bridge.sendModifierKeyToActiveElement Keys[key], false
+      end
+
+      private
+
+      MODIFIERS = [:control, :shift, :alt, :command, :meta]
+
+      def assert_modifier(key)
+        unless MODIFIERS.include? key
+          raise Error::UnsupportedOperationError,
+            "#{key.inspect} is not a modifier key, expected one of #{MODIFIERS.inspect}"
+        end
+      end
+
+    end # Keyboard
+  end # WebDriver
+end  # Selenium

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

@@ -0,0 +1,63 @@
+module Selenium
+  module WebDriver
+    class Mouse
+
+      def initialize(bridge)
+        @bridge = bridge
+      end
+
+      def click(element = nil)
+        move_if_needed element
+        @bridge.click
+      end
+
+      def double_click(element = nil)
+        move_if_needed element
+        @bridge.doubleClick
+      end
+
+      def context_click(element = nil)
+        move_if_needed element
+        @bridge.contextClick
+      end
+
+      def down(element = nil)
+        move_if_needed element
+        @bridge.mouseDown
+      end
+
+      def up(element = nil)
+        move_if_needed element
+        @bridge.mouseUp
+      end
+
+      #
+      # Move the mouse.
+      #
+      # Examples:
+      #
+      #   driver.mouse.move_to(element)
+      #   driver.mouse.move_to(element, 5, 5)
+      #
+
+      def move_to(element, down_by = nil, right_by = nil)
+        unless element.kind_of? Element
+          raise TypeError, "expected #{Element}, got #{element.inspect}:#{element.class}"
+        end
+
+        @bridge.mouseMoveTo element.ref, down_by, right_by
+      end
+
+      def move_by(down_by, right_by)
+        @bridge.mouseMoveTo nil, down_by, right_by
+      end
+
+      private
+
+      def move_if_needed(element)
+        move_to element if element
+      end
+
+    end # Mouse
+  end # WebDriver
+end  # Selenium

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

@@ -1,4 +1,5 @@
 require "rbconfig"
+require "socket"
 
 module Selenium
   module WebDriver
@@ -84,15 +85,18 @@ module Selenium
       end
 
       def cygwin?
-        RUBY_PLATFORM =~ /cygwin/
+        !!(RUBY_PLATFORM =~ /cygwin/)
       end
 
       def wrap_in_quotes_if_necessary(str)
         win? && !cygwin? ? %{"#{str}"} : str
       end
 
-      def cygwin_path(path)
-        `cygpath "#{path}"`.strip
+      def cygwin_path(path, opts = {})
+        flags = []
+        opts.each { |k,v| flags << "--#{k}" if v }
+
+        `cygpath #{flags.join ' '} "#{path}"`.strip
       end
 
       def make_writable(file)
@@ -123,17 +127,28 @@ module Selenium
         nil
       end
 
+      def localhost
+        info = Socket.getaddrinfo "localhost", 80, Socket::AF_INET, Socket::SOCK_STREAM
+
+        if info.empty?
+          raise Error::WebDriverError, "unable to translate 'localhost' for TCP+IPv6"
+        end
+
+        info[0][3]
+      end
+
     end # Platform
   end # WebDriver
 end # Selenium
 
 if __FILE__ == $0
-  p :engine   => Selenium::WebDriver::Platform.engine,
-    :os       => Selenium::WebDriver::Platform.os,
-    :ruby187? => Selenium::WebDriver::Platform.ruby187?,
-    :ruby19?  => Selenium::WebDriver::Platform.ruby19?,
-    :jruby?   => Selenium::WebDriver::Platform.jruby?,
-    :win?     => Selenium::WebDriver::Platform.win?,
-    :home     => Selenium::WebDriver::Platform.home,
-    :bitsize  => Selenium::WebDriver::Platform.bitsize
+  p :engine    => Selenium::WebDriver::Platform.engine,
+    :os        => Selenium::WebDriver::Platform.os,
+    :ruby187?  => Selenium::WebDriver::Platform.ruby187?,
+    :ruby19?   => Selenium::WebDriver::Platform.ruby19?,
+    :jruby?    => Selenium::WebDriver::Platform.jruby?,
+    :win?      => Selenium::WebDriver::Platform.win?,
+    :home      => Selenium::WebDriver::Platform.home,
+    :bitsize   => Selenium::WebDriver::Platform.bitsize,
+    :localhost => Selenium::WebDriver::Platform.localhost
 end

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

@@ -73,7 +73,7 @@ module Selenium
           raise ArgumentError, "invalid proxy type: #{type.inspect}, expected one of #{TYPES.keys.inspect}"
         end
 
-        if @type && type != @type
+        if defined?(@type) && type != @type
           raise ArgumentError, "incompatible proxy type #{type.inspect} (already set to #{@type.inspect})"
         end
 

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

@@ -37,7 +37,6 @@ module Selenium
 
             zos.put_next_entry(entry)
             zos << File.read(file)
-            p :added => file, :as => entry
           end
 
           zos.close

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

@@ -6,14 +6,12 @@ module Selenium
       class Bridge < Remote::Bridge
 
         def initialize(opts = {})
-          @launcher   = Launcher.new(
-            Binary.new,
-            opts.delete(:port) || DEFAULT_PORT,
-            opts.delete(:profile)
-          )
-
+          port        = opts.delete(:port) || DEFAULT_PORT
+          profile     = opts.delete(:profile)
           http_client = opts.delete(:http_client)
 
+          @launcher   = create_launcher(port, profile)
+
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
@@ -45,8 +43,10 @@ module Selenium
           nil
         end
 
-        def getScreenshot
-          execute :screenshot
+        private
+
+        def create_launcher(port, profile)
+          Launcher.new Binary.new, port, profile
         end
 
       end # Bridge

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

@@ -78,7 +78,7 @@ module Selenium
           poller = SocketPoller.new(@host, @port, STABLE_CONNECTION_TIMEOUT)
           unless poller.connected?
             @binary.quit
-            raise Error::WebDriverError, "unable to obtain stable firefox connection in #{STABLE_CONNECTION_TIMEOUT} seconds"
+            raise Error::WebDriverError, "unable to obtain stable firefox connection in #{STABLE_CONNECTION_TIMEOUT} seconds (#{@host}:#{@port})"
           end
         end
 

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

@@ -49,14 +49,18 @@ module Selenium
             @secure_ssl        = DEFAULT_SECURE_SSL
             @untrusted_issuer  = DEFAULT_ASSUME_UNTRUSTED_ISSUER
             @load_no_focus_lib = DEFAULT_LOAD_NO_FOCUS_LIB
+
+            @additional_prefs  = {}
           else
-            @native_events     = model_prefs[WEBDRIVER_PREFS[:native_events]] == "true"
-            @secure_ssl        = model_prefs[WEBDRIVER_PREFS[:untrusted_certs]] != "true" # FIXME: 'untrusted_certs' vs 'secure_ssl'
-            @untrusted_issuer  = model_prefs[WEBDRIVER_PREFS[:untrusted_issuer]] == "true"
-            @load_no_focus_lib = model_prefs[WEBDRIVER_PREFS[:load_no_focus_lib]] == "true" # not stored in profile atm, so will always be false.
+            # TODO: clean this up
+            @native_events     = model_prefs.delete(WEBDRIVER_PREFS[:native_events]) == "true"
+            @secure_ssl        = model_prefs.delete(WEBDRIVER_PREFS[:untrusted_certs]) != "true"
+            @untrusted_issuer  = model_prefs.delete(WEBDRIVER_PREFS[:untrusted_issuer]) == "true"
+            @load_no_focus_lib = model_prefs.delete(WEBDRIVER_PREFS[:load_no_focus_lib]) == "true" # not stored in profile atm, so will always be false.
+
+            @additional_prefs  = model_prefs
           end
 
-          @additional_prefs  = {}
           @extensions        = {}
         end
 

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

@@ -10,16 +10,6 @@ module Selenium
 
       class SocketLock
 
-        #
-        # Need to be really specific about what host to use
-        #
-        # On os x, "localhost" will resolve to 3 different addresses (see /etc/hosts).
-        # Ruby will loop over these and happily bind to the same port on each one,
-        # making it completely unusable for our purposes.
-        #
-
-        HOST = "127.0.0.1"
-
         def initialize(port, timeout)
           @port    = port
           @timeout = timeout
@@ -54,7 +44,7 @@ module Selenium
         end
 
         def can_lock?
-          @server = TCPServer.new(HOST, @port)
+          @server = TCPServer.new(Platform.localhost, @port)
           ChildProcess.close_on_exec @server
 
           true

data/lib/selenium/webdriver/ie.rb

@@ -7,11 +7,13 @@ module Selenium
         :win32 => "#{WebDriver.root}/selenium/webdriver/ie/native/win32/IEDriver.dll",
         :x64   => "#{WebDriver.root}/selenium/webdriver/ie/native/x64/IEDriver.dll"
       }
+
+      DLLS.each { |k,v| DLLS[k] = Platform.cygwin_path(v, :dos => true) } if Platform.cygwin?
     end
   end
 end
 
 require "ffi"
 
-require "selenium/webdriver/ie/lib"
+require "selenium/webdriver/ie/server"
 require "selenium/webdriver/ie/bridge"