selenium-webdriver 0.0.28 → 0.0.29

data/CHANGES

@@ -1,3 +1,28 @@
+0.0.29 (2010-10-09)
+===================
+
+* Element#find_element with :xpath follows the XPath spec (i.e. results are not limited to the receiver's subtree).
+* Element#attribute(attribute) now returns "false" instead of nil.
+* Firefox::Profile instances can now be reused for multiple drivers.
+* Redirect Firefox console logs to a file with Firefox::Profile.log_file= 
+* Added a simple Wait class, based on WebDriverWait in Java.
+* Search PATH for Firefox executable on Windows also.
+* Added Capabilities.android
+* Fix saving of screenshots on Windows and Ruby 1.9 (using "wb" mode string)
+* CSS selector support in the remote driver
+* CSS selector support for IE (using querySelector when available, Sizzle elsewhere)
+* CSS selector support for older versions of Firefox (through Sizzle)
+* Cookie expiration dates are now handled correctly (#730)
+* Make Driver#bridge private, since this seems to be a common cause of confusion.
+* Add {Element,Remote::Capabilities}#as_json for Rails 3 (http://jonathanjulian.com/2010/04/rails-to_json-or-as_json/)
+* User can configure path to exectuables with {Firefox,Chrome}.path = "/some/path"
+* Added "chromium" as a possible name for the Chrome binary (#769)
+* Correctly set the HTTP client timeout (#768)
+* switch_to.window with block now handles exceptions and non-local returns.
+* switch_to.window with block returns the result of the block.
+* Extracted handling of child processes to a separate gem: http://github.com/jarib/childprocess
+
+
 0.0.28 (2010-08-23)
 ===================
 

data/lib/selenium/webdriver.rb

@@ -1,25 +1,18 @@
 require "tmpdir"
 require "fileutils"
+require "date"
+require "childprocess"
 
-have_yajl = lambda {
+have_lib = lambda { |lib|
   begin
-    require "yajl/json_gem"
+    require lib
     true
   rescue LoadError
     false
   end
 }
 
-have_json = lambda {
-  begin
-    require "json"
-    true
-  rescue LoadError
-    false
-  end
-}
-
-unless have_yajl.call || have_json.call
+unless have_lib["yajl/json_gem"] || have_lib["json"]
   raise LoadError, <<-END
 
        You need to require rubygems or install one of these gems:
@@ -32,24 +25,8 @@ unless have_yajl.call || have_json.call
   END
 end
 
+require "selenium/webdriver/common"
 
-require "selenium/webdriver/core_ext/dir"
-require "selenium/webdriver/core_ext/string"
-require "selenium/webdriver/error"
-require "selenium/webdriver/platform"
-require "selenium/webdriver/child_process"
-require "selenium/webdriver/file_reaper"
-require "selenium/webdriver/zip_helper"
-require "selenium/webdriver/target_locator"
-require "selenium/webdriver/navigation"
-require "selenium/webdriver/timeouts"
-require "selenium/webdriver/options"
-require "selenium/webdriver/find"
-require "selenium/webdriver/driver_extensions/takes_screenshot"
-require "selenium/webdriver/keys"
-require "selenium/webdriver/bridge_helper"
-require "selenium/webdriver/driver"
-require "selenium/webdriver/element"
 
 module Selenium
   module WebDriver

data/lib/selenium/webdriver/chrome.rb

@@ -9,9 +9,11 @@ require "socket"
 module Selenium
   module WebDriver
 
-    # @private
     module Chrome
+      def self.path=(path)
+        Launcher.binary_path = path
+      end
     end
 
   end
-end
+end

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

@@ -35,6 +35,17 @@ module Selenium
           )
         end
 
+        #
+        # @private
+        #
+        # @see Chrome.path=
+        #
+
+        def self.binary_path=(path)
+          Platform.assert_executable(path)
+          @binary_path = path
+        end
+
         def launch(server_url)
           create_extension
           create_profile
@@ -44,7 +55,7 @@ module Selenium
         end
 
         def quit
-          @process.ensure_death
+          @process.stop
         end
 
         private
@@ -54,12 +65,6 @@ module Selenium
           rm_rf tmp_extension_dir
           mkdir_p File.dirname(tmp_extension_dir), :mode => 0700
           cp_r ext_path, tmp_extension_dir
-
-          if Platform.win?
-            mv "#{tmp_extension_dir}/manifest-win.json", "#{tmp_extension_dir}/manifest.json"
-          else
-            mv "#{tmp_extension_dir}/manifest-nonwin.json", "#{tmp_extension_dir}/manifest.json"
-          end
         end
 
         def create_profile
@@ -87,11 +92,11 @@ module Selenium
 
           args << server_url
 
-          @process = ChildProcess.new(*args).start
+          @process = ChildProcess.build(*args).start
         end
 
         def ext_path
-          @ext_path ||= ZipHelper.unzip("#{WebDriver.root}/selenium/webdriver/chrome/extension.zip")
+          @ext_path ||= Zipper.unzip("#{WebDriver.root}/selenium/webdriver/chrome/extension.zip")
         end
 
         def tmp_extension_dir
@@ -136,17 +141,11 @@ module Selenium
           rescue Win32::Registry::Error
             nil
           end
-
-          def quit
-            # looks like we need a kill right away on Windows + MRI
-            @process.kill if Platform.engine == :ruby
-            super
-          end
         end
 
         class UnixLauncher < Launcher
           def self.possible_paths
-            [Platform.find_binary("google-chrome"), "/usr/bin/google-chrome"].compact
+            [Platform.find_binary("google-chrome"), Platform.find_binary("chromium"), "/usr/bin/google-chrome"].compact
           end
 
         end

data/lib/selenium/webdriver/common.rb

@@ -0,0 +1,18 @@
+require "selenium/webdriver/common/core_ext/dir"
+require "selenium/webdriver/common/core_ext/string"
+require "selenium/webdriver/common/error"
+require "selenium/webdriver/common/platform"
+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/target_locator"
+require "selenium/webdriver/common/navigation"
+require "selenium/webdriver/common/timeouts"
+require "selenium/webdriver/common/options"
+require "selenium/webdriver/common/find"
+require "selenium/webdriver/common/driver_extensions/takes_screenshot"
+require "selenium/webdriver/common/keys"
+require "selenium/webdriver/common/bridge_helper"
+require "selenium/webdriver/common/driver"
+require "selenium/webdriver/common/element"

data/lib/selenium/webdriver/{driver.rb → common/driver.rb}

@@ -13,8 +13,6 @@ module Selenium
     class Driver
       include Find
 
-      attr_reader :bridge
-
       class << self
 
         #
@@ -62,8 +60,8 @@ module Selenium
         @bridge = bridge
 
         # TODO: refactor this away
-        unless @bridge.driver_extensions.empty?
-          extend(*@bridge.driver_extensions)
+        unless bridge.driver_extensions.empty?
+          extend(*bridge.driver_extensions)
         end
       end
 
@@ -77,7 +75,7 @@ module Selenium
       #
 
       def navigate
-        @navigate ||= WebDriver::Navigation.new(self)
+        @navigate ||= WebDriver::Navigation.new(bridge)
       end
 
       #
@@ -86,7 +84,7 @@ module Selenium
       #
 
       def switch_to
-        @switch_to ||= WebDriver::TargetLocator.new(self)
+        @switch_to ||= WebDriver::TargetLocator.new(bridge)
       end
 
       #
@@ -95,7 +93,7 @@ module Selenium
       #
 
       def manage
-        @manage ||= WebDriver::Options.new(self)
+        @manage ||= WebDriver::Options.new(bridge)
       end
 
       #
@@ -258,6 +256,20 @@ module Selenium
         nil
       end
 
+      def browser
+        bridge.browser
+      end
+
+      def capabilities
+        bridge.capabilities
+      end
+
+      private
+
+      def bridge
+        @bridge
+      end
+
     end # Driver
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/{driver_extensions → common/driver_extensions}/takes_screenshot.rb

@@ -9,7 +9,7 @@ module Selenium
       module TakesScreenshot
 
         def save_screenshot(png_path)
-          File.open(png_path, 'w') { |f| f << screenshot_as(:png) }
+          File.open(png_path, 'wb') { |f| f << screenshot_as(:png) }
         end
 
         def screenshot_as(format)
@@ -26,4 +26,4 @@ module Selenium
       end # TakesScreenshot
     end # DriverExtensions
   end # WebDriver
-end # Selenium
+end # Selenium

data/lib/selenium/webdriver/{element.rb → common/element.rb}

@@ -57,7 +57,24 @@ module Selenium
       end
 
       #
-      # Get the value of the given attribute
+      # Get the value of a the given attribute of the element. Will return the current value, even if
+      # this has been modified after the page has been loaded. More exactly, this method will return
+      # the value of the given attribute, unless that attribute is not present, in which case the
+      # value of the property with the same name is returned. If neither value is set, nil is
+      # returned. The "style" attribute is converted as best can be to a text representation with a
+      # trailing semi-colon. The following are deemed to be "boolean" attributes, and will
+      # return either "true" or "false":
+      #
+      # async, autofocus, autoplay, checked, compact, complete, controls, declare, defaultchecked,
+      # defaultselected, defer, disabled, draggable, ended, formnovalidate, hidden, indeterminate,
+      # iscontenteditable, ismap, itemscope, loop, multiple, muted, nohref, noresize, noshade, novalidate,
+      # nowrap, open, paused, pubdate, readonly, required, reversed, scoped, seamless, seeking,
+      # selected, spellcheck, truespeed, willvalidate
+      #
+      # Finally, the following commonly mis-capitalized attribute/property names are evaluated as
+      # expected:
+      #
+      # class, readonly
       #
       # @param [String]
       #   attribute name
@@ -272,9 +289,19 @@ module Selenium
       #
 
       def to_json(*args)
-        { :ELEMENT => @id }.to_json(*args)
+        as_json.to_json(*args)
+      end
+
+      #
+      # For Rails 3 - http://jonathanjulian.com/2010/04/rails-to_json-or-as_json/
+      #
+      # @private
+      #
+
+      def as_json(opts = nil)
+        { :ELEMENT => @id }
       end
 
     end # Element
   end # WebDriver
-end # Selenium
+end # Selenium

data/lib/selenium/webdriver/{find.rb → common/find.rb}

@@ -18,12 +18,18 @@ module Selenium
       #
       # Find the first element matching the given arguments.
       #
+      # When using Element#find_element with :xpath, be aware that webdriver
+      # follows standard conventions: a search prefixed with "//" will search
+      # the entire document, not just the children of this current node. Use 
+      # ".//" to limit your search to the children of the receiving Element.
+      #
       # @param [:class, :class_name, :id, :link_text, :link, :partial_link_text, :name, :tag_name, :xpath] how
       # @param [String] what
       # @return [WebDriver::Element]
       #
       # @raise [NoSuchElementError] if the element doesn't exist
       #
+      #
 
       def find_element(*args)
         how, what = extract_args(args)
@@ -41,6 +47,8 @@ module Selenium
       #
       # Find all elements matching the given arguments
       #
+      # @see Find#find_element
+      #
       # @param [:class, :class_name, :id, :link_text, :link, :partial_link_text, :name, :tag_name, :xpath] how
       # @param [String] what
       # @return [Array<WebDriver::Element>]
@@ -84,4 +92,4 @@ module Selenium
 
     end # Find
   end # WebDriver
-end # Selenium
+end # Selenium

data/lib/selenium/webdriver/{navigation.rb → common/navigation.rb}

@@ -2,8 +2,8 @@ module Selenium
   module WebDriver
     class Navigation
 
-      def initialize(driver)
-        @bridge = driver.bridge
+      def initialize(bridge)
+        @bridge = bridge
       end
 
       #
@@ -40,4 +40,4 @@ module Selenium
 
     end # Navigation
   end # WebDriver
-end # Selenium
+end # Selenium

data/lib/selenium/webdriver/{options.rb → common/options.rb}

@@ -6,8 +6,8 @@ module Selenium
       # @private
       #
 
-      def initialize(driver)
-        @bridge = driver.bridge
+      def initialize(bridge)
+        @bridge = bridge
       end
 
       #
@@ -18,6 +18,7 @@ module Selenium
       # @option opts [String] :value A value
       # @option opts [String] :path ('/') A path
       # @option opts [String] :secure (false) A boolean
+      # @option opts [Time,DateTime,Numeric,nil] :expires (nil) Expiry date, either as a Time, DateTime, or seconds since epoch.
       #
       # @raise [ArgumentError] if :name or :value is not specified
       #
@@ -29,9 +30,25 @@ module Selenium
         opts[:path] ||= "/"
         opts[:secure] ||= false
 
+        if obj = opts[:expires]
+          opts[:expiry] = seconds_from(obj)
+        end
+
+
         @bridge.addCookie opts
       end
 
+      #
+      # Get the cookie with the given name
+      #
+      # @param [String] name the name of the cookie
+      # @return [Hash, nil] the cookie, or nil if it wasn't found.
+      #
+
+      def cookie_named(name)
+        all_cookies.find { |c| c[:name] == name }
+      end
+
       #
       # Delete the cookie with the given name
       #
@@ -62,8 +79,8 @@ module Selenium
             :name    => cookie["name"],
             :value   => cookie["value"],
             :path    => cookie["path"],
-            :domain  => cookie["domain"],
-            :expires => cookie["expires"],
+            :domain  => strip_port(cookie["domain"]),
+            :expires => cookie["expiry"] && datetime_at(cookie['expiry']),
             :secure  => cookie["secure"]
           }
         end
@@ -81,6 +98,31 @@ module Selenium
         @timeouts ||= Timeouts.new(@bridge)
       end
 
+      private
+
+      SECONDS_PER_DAY = 86_400.0
+
+      def datetime_at(int)
+        DateTime.civil(1970) + (int / SECONDS_PER_DAY)
+      end
+
+      def seconds_from(obj)
+        case obj
+        when Time
+          obj.to_f
+        when DateTime
+          (obj - DateTime.civil(1970)) * SECONDS_PER_DAY
+        when Numeric
+          obj
+        else
+          raise ArgumentError, "invalid value for expiration date: #{obj.inspect}"
+        end
+      end
+
+      def strip_port(str)
+        str.split(":", 2).first
+      end
+
     end # Options
   end # WebDriver
-end # Selenium
+end # Selenium