selenium-webdriver 0.1.1 → 0.1.2

data/CHANGES

@@ -1,3 +1,13 @@
+0.1.2 (2010-12-??)
+============
+
+* Changed frame switching behaviour (http://groups.google.com/group/selenium-developers/browse_thread/thread/8dc7938c35bb3968)
+* IE driver rewrite landed.
+* Initial support for alerts/prompts (in Firefox).
+* Cygwin support.
+* Driver#execute_script now properly wraps elements inside Hashes.
+* Various fixes for Firefox 4.
+
 0.1.1 (2010-11-29)
 ==================
 

data/lib/selenium/webdriver.rb

@@ -39,12 +39,34 @@ module Selenium
     autoload :Remote,  'selenium/webdriver/remote'
     autoload :Firefox, 'selenium/webdriver/firefox'
 
+    # @api private
+
     def self.root
       @root ||= File.expand_path(File.join(File.dirname(__FILE__), ".."))
     end
 
     #
-    # @see Selenium::WebDriver::Driver.for
+    # Create a new Driver instance with the correct bridge for the given browser
+    #
+    # @param browser [:ie, :internet_explorer, :remote, :chrome, :firefox, :ff, :android, :iphone]
+    #   the driver type to use
+    # @param *rest
+    #   arguments passed to Bridge.new
+    #
+    # @return [Driver]
+    #
+    # @see Selenium::WebDriver::Remote::Bridge
+    # @see Selenium::WebDriver::Firefox::Bridge
+    # @see Selenium::WebDriver::IE::Bridge
+    # @see Selenium::WebDriver::Chrome::Bridge
+    # @see Selenium::WebDriver::Android::Bridge
+    # @see Selenium::WebDriver::IPhone::Bridge
+    #
+    # @example
+    #
+    #   WebDriver.for :firefox, :profile => "some-profile"
+    #   WebDriver.for :firefox, :profile => Profile.new
+    #   WebDriver.for :remote,  :url => "http://localhost:4444/wd/hub", :desired_capabilities => caps
     #
 
     def self.for(*args)

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

@@ -2,7 +2,7 @@ module Selenium
   module WebDriver
     module Chrome
 
-      # @private
+      # @api private
       class Bridge < Remote::Bridge
 
         def initialize(opts = {})
@@ -73,6 +73,10 @@ module Selenium
           element.ref == other.ref
         end
 
+        %w[acceptAlert dismissAlert setAlertValue getAlertText].each do |m|
+          define_method(m) { |*args| raise NotImplementedError }
+        end
+
         private
 
         def execute(command_name, opts = {}, args = nil)

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

@@ -2,7 +2,7 @@ module Selenium
   module WebDriver
     module Chrome
 
-      # @private
+      # @api private
       class CommandExecutor
         HTML_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n%s"
         JSON_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: application/json; charset=UTF-8\r\n\r\n%s"

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

@@ -2,7 +2,7 @@ module Selenium
   module WebDriver
     module Chrome
 
-      # @private
+      # @api private
       class Launcher
         include FileUtils
 
@@ -21,7 +21,7 @@ module Selenium
         end
 
         #
-        # @private
+        # @api private
         #
         # @see Chrome.path=
         #
@@ -58,8 +58,10 @@ module Selenium
         end
 
         def launch_chrome(server_url)
+          path = self.class.binary_path
+
           args = [
-            Platform.wrap_in_quotes_if_necessary(self.class.binary_path),
+            Platform.wrap_in_quotes_if_necessary(path),
             "--load-extension=#{Platform.wrap_in_quotes_if_necessary(tmp_extension_dir)}",
             "--activate-on-launch",
             "--disable-hang-monitor",
@@ -138,13 +140,17 @@ module Selenium
           end
 
           def windows_paths
-            [
+            paths = [
               windows_registry_path,
               "#{ENV['USERPROFILE']}\\Local Settings\\Application Data\\Google\\Chrome\\Application\\chrome.exe",
               "#{ENV['USERPROFILE']}\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe",
               "#{Platform.home}\\Local Settings\\Application Data\\Google\\Chrome\\Application\\chrome.exe",
               "#{Platform.home}\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe",
             ].compact
+
+            paths.map! { |path| Platform.cygwin_path(path) } if Platform.cygwin?
+
+            paths
           end
 
           def windows_registry_path

data/lib/selenium/webdriver/common.rb

@@ -7,6 +7,7 @@ require "selenium/webdriver/common/file_reaper"
 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/target_locator"
 require "selenium/webdriver/common/navigation"
 require "selenium/webdriver/common/timeouts"

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

@@ -0,0 +1,27 @@
+module Selenium
+  module WebDriver
+    class Alert
+
+      def initialize(bridge)
+        @bridge = bridge
+      end
+
+      def accept
+        @bridge.acceptAlert
+      end
+
+      def dismiss
+        @bridge.dismissAlert
+      end
+
+      def send_keys(keys)
+        @bridge.setAlertValue keys
+      end
+
+      def text
+        @bridge.getAlertText
+      end
+
+    end # Alert
+  end # WebDriver
+end # Selenium

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

@@ -4,20 +4,23 @@ module Selenium
     #
     # Shared across bridges
     #
-    # @private
+    # @api private
     #
 
     module BridgeHelper
 
       def unwrap_script_result(arg)
-        if arg.kind_of?(Array)
+        case arg
+        when Array
           arg.map { |e| unwrap_script_result(e) }
-        else
-          if arg.kind_of?(Hash) && arg.member?("ELEMENT")
-            Element.new self, element_id_from(arg)
+        when Hash
+          if id = element_id_from(arg)
+            Element.new self, id
           else
-            arg
+            arg.each { |k, v| arg[k] = unwrap_script_result(v) }
           end
+        else
+          arg
         end
       end
 
@@ -61,4 +64,4 @@ module Selenium
 
     end # BridgeHelper
   end # WebDriver
-end # Selenium
+end # Selenium

data/lib/selenium/webdriver/common/core_ext/dir.rb

@@ -1,5 +1,5 @@
 class Dir
-  # @private
+  # @api private
   def self.mktmpdir(prefix_suffix=nil, tmpdir=nil)
     case prefix_suffix
     when nil

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

@@ -16,20 +16,9 @@ module Selenium
       class << self
 
         #
-        # Create a new Driver instance with the correct bridge for the given browser
+        # @api private
         #
-        # @param browser [:ie, :internet_explorer, :remote, :chrome, :firefox, :ff]
-        #   the driver type to use
-        # @param *rest
-        #   arguments passed to Bridge.new
-        #
-        # @return [Driver]
-        #
-        # @example
-        #
-        #   Driver.for :firefox, :profile => "some-profile"
-        #   Driver.for :firefox, :profile => Profile.new
-        #   Driver.for :remote,  :url => "http://localhost:4444/wd/hub", :desired_capabilities => caps
+        # @see Selenium::WebDriver.for
         #
 
         def for(browser, *args)
@@ -55,7 +44,8 @@ module Selenium
       end
 
       #
-      # A new Driver instance with the given bridge
+      # A new Driver instance with the given bridge.
+      # End users should use Selenium::WebDriver.for instead of using this directly.
       #
       # @api private
       #
@@ -201,7 +191,7 @@ module Selenium
       # @param [String] script
       #   JavaScript source to execute
       # @param [WebDriver::Element,Integer, Float, Boolean, NilClass, String, Array] *args
-      #   Arguments will be available in the given script as the 'arguments' array.
+      #   Arguments will be available in the given script in the 'arguments' pseudo-array.
       #
       # @return [WebDriver::Element,Integer,Float,Boolean,NilClass,String,Array]
       #   The value returned from the script.
@@ -237,6 +227,8 @@ module Selenium
       # @param  [String,Hash] id or selector
       # @return [WebDriver::Element]
       #
+      # Examples:
+      #
       #   driver['someElementId']    #=> #<WebDriver::Element:0x1011c3b88>
       #   driver[:tag_name => 'div'] #=> #<WebDriver::Element:0x1011c3b88>
       #
@@ -253,7 +245,7 @@ module Selenium
       #
       # for Find
       #
-      # @private
+      # @api private
       #
 
       def ref

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

@@ -2,7 +2,7 @@ module Selenium
   module WebDriver
 
     #
-    # @private
+    # @api private
     #
 
     module DriverExtensions

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

@@ -2,7 +2,7 @@ module Selenium
   module WebDriver
 
     #
-    # @private
+    # @api private
     #
 
     module DriverExtensions

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

@@ -8,7 +8,7 @@ module Selenium
       #
       # Creates a new Element
       #
-      # @private
+      # @api private
       #
 
       def initialize(bridge, id)
@@ -274,7 +274,7 @@ module Selenium
       #
       # for Find and execute_script
       #
-      # @private
+      # @api private
       #
 
       def ref
@@ -285,7 +285,7 @@ module Selenium
       # Convert to a WebElement JSON Object for transmission over the wire.
       # @see http://code.google.com/p/selenium/wiki/JsonWireProtocol#Basic_Concepts_And_Terms
       #
-      # @private
+      # @api private
       #
 
       def to_json(*args)
@@ -295,7 +295,7 @@ module Selenium
       #
       # For Rails 3 - http://jonathanjulian.com/2010/04/rails-to_json-or-as_json/
       #
-      # @private
+      # @api private
       #
 
       def as_json(opts = nil)

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

@@ -71,7 +71,9 @@ module Selenium
         :f9           => "\xEE\x80\xB9",
         :f10          => "\xEE\x80\xBA",
         :f11          => "\xEE\x80\xBB",
-        :f12          => "\xEE\x80\xBC"
+        :f12          => "\xEE\x80\xBC",
+        :meta         => "\xEE\x80\xBD",
+        :command      => "\xEE\x80\xBD" # alias
       }
 
       def self.[](key)

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

@@ -3,7 +3,7 @@ module Selenium
     class Options
 
       #
-      # @private
+      # @api private
       #
 
       def initialize(bridge)
@@ -79,7 +79,7 @@ module Selenium
             :name    => cookie["name"],
             :value   => cookie["value"],
             :path    => cookie["path"],
-            :domain  => strip_port(cookie["domain"]),
+            :domain  => cookie["domain"] && strip_port(cookie["domain"]),
             :expires => cookie["expiry"] && datetime_at(cookie['expiry']),
             :secure  => cookie["secure"]
           }

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

@@ -3,7 +3,7 @@ require "rbconfig"
 module Selenium
   module WebDriver
 
-    # @private
+    # @api private
     module Platform
 
       module_function
@@ -27,7 +27,7 @@ module Selenium
         @os ||= (
           host_os = RbConfig::CONFIG['host_os']
           case host_os
-          when /mswin|msys|mingw32/
+          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
             :windows
           when /darwin|mac os/
             :macosx
@@ -83,8 +83,16 @@ module Selenium
         os == :linux
       end
 
+      def cygwin?
+        RUBY_PLATFORM =~ /cygwin/
+      end
+
       def wrap_in_quotes_if_necessary(str)
-        win? ? %{"#{str}"} : str
+        win? && !cygwin? ? %{"#{str}"} : str
+      end
+
+      def cygwin_path(path)
+        `cygpath "#{path}"`.strip
       end
 
       def make_writable(file)

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

@@ -1,3 +1,4 @@
+require "selenium/webdriver/common/platform"
 require "socket"
 
 module Selenium
@@ -35,12 +36,15 @@ module Selenium
 
       private
 
+      SOCKET_ERRORS = [Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError]
+      SOCKET_ERRORS << Errno::EPERM if Platform.cygwin?
+
       def listening?
         # There's a bug in 1.9.1 on Windows where this will succeed even if no
         # one is listening. Users who hit that should upgrade their Ruby.
         TCPSocket.new(@host, @port).close
         true
-      rescue Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError => e
+      rescue *SOCKET_ERRORS => e
         $stderr.puts [@host, @port].inspect if $DEBUG
         false
       end

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

@@ -19,13 +19,13 @@ module Selenium
       end
 
       #
-      # switch to the frame with the given id
+      # switch to the given window handle
       #
-      # If given a block, this method will return to the original window after
+      # If given a block, this method will switch back to the original window after
       # block execution.
       #
       # @param id
-      #   A window handle
+      #   A window handle, obtained through Driver#window_handles
       #
 
       def window(id)
@@ -68,6 +68,14 @@ module Selenium
         @bridge.switchToDefaultContent
       end
 
+      #
+      # switches to the currently active modal dialog for this particular driver instance
+      #
+
+      def alert
+        Alert.new(@bridge)
+      end
+
     end # TargetLocator
   end # WebDriver
 end  # Selenium

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

@@ -14,6 +14,16 @@ module Selenium
         @bridge.setImplicitWaitTimeout seconds * 1000
       end
 
+      #
+      # Sets the amount of time to wait for an asynchronous script to finish
+      # execution before throwing an error. If the timeout is negative, then the
+      # script will be allowed to run indefinitely.
+      #
+
+      def script_timeout=(seconds)
+        @bridge.setScriptTimeout seconds * 1000
+      end
+
     end # Timeouts
   end # WebDriver
 end # Selenium