selenium-webdriver 2.13.0 → 2.14.0

data/CHANGES

@@ -1,3 +1,23 @@
+2.14.0 (???)
+===================
+
+* Add Selenium::WebDriver::Support::Select class to ease working with select lists.
+* Add Capabilities.ipad and Capabilities.iphone (#2895)
+* Replace json_pure dependency with multi_json. (#2901)
+* Don't leave sockets hanging in SYN_SENT state while polling.
+* Allow selecting option elements even if the enclosing select has zero opacity.
+* Exception renames (old names aliased and will still work in rescues):
+  * ObsoleteElementError      -> StaleElementReferenceError
+  * UnhandledError            -> UnknownError
+  * UnexpectedJavascriptError -> JavascriptError
+  * NoAlertOpenError          -> NoAlertPresentError
+  * ElementNotDisplayedError  -> ElementNotVisibleError
+* Firefox:
+  * Fixed issue with scrolling on small viewports with native events.
+  * Fix CSS selector support in Firefox 3.0
+* IE:
+  * Implement the window control API
+
 2.13.0 (2011-11-18)
 ===================
 

data/lib/selenium/webdriver.rb

@@ -3,28 +3,7 @@ require 'tmpdir'
 require 'fileutils'
 require 'date'
 
-have_lib = lambda { |lib|
-  begin
-    require lib
-    true
-  rescue LoadError
-    false
-  end
-}
-
-unless have_lib['yajl/json_gem'] || have_lib['json']
-  raise LoadError, <<-END
-
-       You need to require rubygems or install one of these gems:
-
-           yajl-ruby (best on MRI)
-           json
-           json-jruby (native JRuby)
-           json_pure (any platform)
-
-  END
-end
-
+require 'multi_json'
 require 'selenium/webdriver/common'
 
 module Selenium

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

@@ -1,6 +1,11 @@
 module Selenium
   module WebDriver
     module Android
+
+      #
+      # @api private
+      #
+
       class Bridge < Remote::Bridge
 
         DEFAULT_URL = "http://#{Platform.localhost}:8080/wd/hub/"

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

@@ -78,6 +78,8 @@ module Selenium
           caps.merge! 'chrome.nativeEvents' => true if native_events
           caps.merge! 'chrome.verbose'      => true if verbose
           caps.merge! 'chrome.detach'       => detach.nil? || !!detach
+
+          caps
         end
 
       end # Bridge

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

@@ -61,7 +61,7 @@ module Selenium
           prefs_file = prefs_file_for(dir)
 
           FileUtils.mkdir_p File.dirname(prefs_file)
-          File.open(prefs_file, "w") { |file| file << prefs.to_json  }
+          File.open(prefs_file, "w") { |file| file << MultiJson.encode(prefs)  }
         end
 
         def prefs
@@ -70,7 +70,7 @@ module Selenium
 
         def read_model_prefs
           return {} unless @model
-          JSON.parse File.read(prefs_file_for(@model))
+          MultiJson.decode File.read(prefs_file_for(@model))
         end
 
         def prefs_file_for(dir)

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

@@ -20,6 +20,8 @@ module Selenium
         #
         # @see Selenium::WebDriver.for
         #
+        # @return [Driver]
+        #
 
         def for(browser, opts = {})
           listener = opts.delete(:listener)

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

@@ -28,6 +28,8 @@ module Selenium
         #
         # By default, no file detection is performed.
         #
+        # @api public
+        #
 
         def file_detector=(detector)
           unless detector.nil? or detector.respond_to? :call

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

@@ -224,7 +224,7 @@ module Selenium
       #
 
       def to_json(*args)
-        as_json.to_json(*args)
+        MultiJson.encode as_json
       end
 
       #

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

@@ -3,43 +3,149 @@ module Selenium
     module Error
 
       class WebDriverError < StandardError; end
+      class UnsupportedOperationError < WebDriverError; end
+
       class IndexOutOfBoundsError < WebDriverError; end          # 1
       class NoCollectionError < WebDriverError; end              # 2
       class NoStringError < WebDriverError; end                  # 3
       class NoStringLengthError < WebDriverError; end            # 4
       class NoStringWrapperError < WebDriverError; end           # 5
       class NoSuchDriverError < WebDriverError; end              # 6
+
+      #
+      # An element could not be located on the page using the given search
+      # parameters.
+      #
+
       class NoSuchElementError < WebDriverError; end             # 7
+
+      #
+      # A request to switch to a frame could not be satisfied because the
+      # frame could not be found.
+      #
+
       class NoSuchFrameError < WebDriverError; end               # 8
       class UnknownCommandError < WebDriverError; end            # 9
-      class ObsoleteElementError < WebDriverError; end           # 10
-      class ElementNotDisplayedError < WebDriverError; end       # 11
+
+
+      #
+      # Indicates that a reference to an element is now "stale" - the element
+      # no longer appears in the DOM of the page.
+      #
+
+      class StaleElementReferenceError < WebDriverError; end     # 10
+
+      #
+      # Raised to indicate that although an element is present on the DOM,
+      # it is not visible, and so is not able to be interacted with.
+      #
+
+      class ElementNotVisibleError < WebDriverError; end         # 11
+
+      #
+      # Raised when an interaction could not be performed because the element
+      # is in an invalid state (e.g. attempting to click a disabled element).
+      #
+
       class InvalidElementStateError < WebDriverError; end       # 12
-      class UnhandledError < WebDriverError; end                 # 13
+
+      #
+      # An unknown server-side error occurred while processing the command.
+      #
+
+      class UnknownError < WebDriverError; end                   # 13
       class ExpectedError < WebDriverError; end                  # 14
+
+      #
+      # An attempt was made to select an element that cannot be selected.
+      #
+
       class ElementNotSelectableError < WebDriverError; end      # 15
       class NoSuchDocumentError < WebDriverError; end            # 16
-      class UnexpectedJavascriptError < WebDriverError; end      # 17
+
+      #
+      # An error occurred while executing user supplied JavaScript.
+      #
+
+      class JavascriptError < WebDriverError; end                # 17
       class NoScriptResultError < WebDriverError; end            # 18
+
+      #
+      # An error occurred while searching for an element by XPath.
+      #
+
       class XPathLookupError < WebDriverError; end               # 19
       class NoSuchCollectionError < WebDriverError; end          # 20
+
+      #
+      # Raised when a command does not complete in enough time.
+      #
+
       class TimeOutError < WebDriverError; end                   # 21
       class NullPointerError < WebDriverError; end               # 22
       class NoSuchWindowError < WebDriverError; end              # 23
+
+      #
+      # Raised when attempting to add a cookie under a different domain than
+      # the current URL.
+      #
+
       class InvalidCookieDomainError < WebDriverError; end       # 24
+
+      #
+      # Raised when a driver fails to set a cookie.
+      #
+
       class UnableToSetCookieError < WebDriverError; end         # 25
       class UnexpectedAlertError < WebDriverError; end           # 26
-      class NoAlertOpenError < WebDriverError; end               # 27
+
+      #
+      # Indicates that a user has tried to access an alert when one is not present.
+      #
+
+      class NoAlertPresentError < WebDriverError; end            # 27
+
+      #
+      # A script did not complete before its timeout expired.
+      #
+
       class ScriptTimeOutError < WebDriverError; end             # 28
+
+      #
+      # The coordinates provided to an interactions operation are invalid.
+      #
+
       class InvalidElementCoordinatesError < WebDriverError; end # 29
+
+      #
+      # Indicates that IME support is not available. This exception is rasied
+      # for every IME-related method call if IME support is not available on
+      # the machine.
+      #
+
       class IMENotAvailableError < WebDriverError; end           # 30
+
+      #
+      # Indicates that activating an IME engine has failed.
+      #
+
       class IMEEngineActivationFailedError < WebDriverError; end # 31
+
+      #
+      # Argument was an invalid selector (e.g. XPath/CSS).
+      #
+
       class InvalidSelectorError < WebDriverError; end           # 32
                                                                  # 33
+
+      #
+      # Indicates that the target provided to the actions #move method is
+      # invalid, e.g. outside of the bounds of the window.
+      #
+
       class MoveTargetOutOfBoundsError < WebDriverError; end     # 34
-      
-      class UnsupportedOperationError < WebDriverError; end
 
+      # @api private
       Errors = [
         IndexOutOfBoundsError,          # 1
         NoCollectionError,              # 2
@@ -50,14 +156,14 @@ module Selenium
         NoSuchElementError,             # 7
         NoSuchFrameError,               # 8
         UnknownCommandError,            # 9
-        ObsoleteElementError,           # 10
-        ElementNotDisplayedError,       # 11
+        StaleElementReferenceError,     # 10
+        ElementNotVisibleError,         # 11
         InvalidElementStateError,       # 12
-        UnhandledError,                 # 13
+        UnknownError,                   # 13
         ExpectedError,                  # 14
         ElementNotSelectableError,      # 15
         NoSuchDocumentError,            # 16
-        UnexpectedJavascriptError,      # 17
+        JavascriptError,                # 17
         NoScriptResultError,            # 18
         XPathLookupError,               # 19
         NoSuchCollectionError,          # 20
@@ -67,7 +173,7 @@ module Selenium
         InvalidCookieDomainError,       # 24
         UnableToSetCookieError,         # 25
         UnexpectedAlertError,           # 26
-        NoAlertOpenError,               # 27
+        NoAlertPresentError,            # 27
         ScriptTimeOutError,             # 28
         InvalidElementCoordinatesError, # 29
         IMENotAvailableError,           # 30
@@ -77,6 +183,21 @@ module Selenium
         MoveTargetOutOfBoundsError      # 34
       ]
 
+      # aliased for backwards compatibility
+      ObsoleteElementError = StaleElementReferenceError
+
+      # aliased for backwards compatibility
+      UnhandledError = UnknownError
+
+      # aliased for backwards compatibility
+      UnexpectedJavascriptError = JavascriptError
+
+      # aliased for backwards compatibility
+      NoAlertOpenError = NoAlertPresentError
+
+      # aliased for backwards compatibility
+      ElementNotDisplayedError = ElementNotVisibleError
+
       class << self
         def for_code(code)
           return if code == 0

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

@@ -1,5 +1,10 @@
 module Selenium
   module WebDriver
+
+    #
+    # @api private
+    #
+
     module FileReaper
 
       class << self

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

@@ -30,7 +30,7 @@ module Selenium
         opts[:path] ||= "/"
         opts[:secure] ||= false
 
-        if obj = opts[:expires]
+        if obj = opts.delete(:expires)
           opts[:expiry] = seconds_from(obj)
         end
 
@@ -89,10 +89,10 @@ module Selenium
       def timeouts
         @timeouts ||= Timeouts.new(@bridge)
       end
-      
+
       #
       # @api beta This API may be changed or removed in a future release.
-      # 
+      #
 
       def window
         @window ||= Window.new(@bridge)

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

@@ -2,7 +2,7 @@ module Selenium
   module WebDriver
 
     #
-    # @private
+    # @api private
     #
     # Common methods for Chrome::Profile and Firefox::Profile
     # Includers must implement #layout_on_disk
@@ -19,7 +19,7 @@ module Selenium
       end
 
       def to_json(*args)
-        as_json.to_json(*args)
+        MultiJson.encode as_json
       end
 
       private
@@ -46,7 +46,7 @@ module Selenium
 
       module ClassMethods
         def from_json(json)
-          data = JSON.parse(json).fetch('zip')
+          data = MultiJson.decode(json).fetch('zip')
 
           # can't use Tempfile here since it doesn't support File::BINARY mode on 1.8
           # can't use Dir.mktmpdir(&blk) because of http://jira.codehaus.org/browse/JRUBY-4082

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

@@ -95,6 +95,10 @@ module Selenium
         json_result if json_result.length > 1
       end
 
+      def to_json(*args)
+        MultiJson.encode as_json
+      end
+
       class << self
         def json_create(data)
           proxy = new

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

@@ -2,6 +2,7 @@ module Selenium
   module WebDriver
     module SearchContext
 
+      # @api private
       FINDERS = {
         :class             => 'class name',
         :class_name        => 'class name',
@@ -25,9 +26,9 @@ module Selenium
       #
       # @param [:class, :class_name, :css, :id, :link_text, :link, :partial_link_text, :name, :tag_name, :xpath] how
       # @param [String] what
-      # @return [WebDriver::Element]
+      # @return [Element]
       #
-      # @raise [NoSuchElementError] if the element doesn't exist
+      # @raise [Error::NoSuchElementError] if the element doesn't exist
       #
       #
 
@@ -48,7 +49,7 @@ module Selenium
       #
       # @param [:class, :class_name, :css, :id, :link_text, :link, :partial_link_text, :name, :tag_name, :xpath] how
       # @param [String] what
-      # @return [Array<WebDriver::Element>]
+      # @return [Array<Element>]
       #
 
       def find_elements(*args)

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

@@ -74,6 +74,7 @@ module Selenium
           sock.close
           true
         rescue *NOT_CONNECTED_ERRORS
+          sock.close if sock
           $stderr.puts [@host, @port].inspect if $DEBUG
           false
         end

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

@@ -4,6 +4,10 @@ require 'find'
 
 module Selenium
   module WebDriver
+    #
+    # @api private
+    #
+
     module Zipper
 
       EXTENSIONS = %w[.zip .xpi]