selenium-webdriver 0.0.27 → 0.0.28

data/CHANGES

@@ -1,3 +1,12 @@
+0.0.28 (2010-08-23)
+===================
+
+* Fix behaviour of Element#==, Element#eql? and Element#hash (#hash still has issues on IE / remote).
+* Include remote server backtrace in raised errors (if available).
+* Chrome: Untrusted certificate support.
+* IE: Fix NoMethodError when getElementAttribute returns nil.
+* Driver#[] shorthand can take a locator hash, not just an id string.
+
 0.0.27 (2010-07-22)
 ===================
 

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

@@ -6,9 +6,12 @@ module Selenium
       class Bridge < Remote::Bridge
 
         def initialize(opts = {})
-          @executor = CommandExecutor.new
+          @launcher = Launcher.launcher(
+            :default_profile => opts[:default_profile],
+            :secure_ssl      => opts[:secure_ssl]
+          )
 
-          @launcher = Launcher.launcher(:default_profile => opts[:default_profile])
+          @executor = CommandExecutor.new
           @launcher.launch(@executor.uri)
         end
 
@@ -66,6 +69,10 @@ module Selenium
           execute :implicitlyWait, :ms => milliseconds
         end
 
+        def elementEquals(element, other)
+          element.ref == other.ref
+        end
+
         private
 
         def execute(command_name, opts = {}, args = nil)
@@ -117,4 +124,4 @@ module Selenium
       end # Bridge
     end # Chrome
   end # WebDriver
-end # Selenium
+end # Selenium

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

@@ -24,8 +24,8 @@ module Selenium
         end
 
         def initialize(opts = {})
-          super()
           @default_profile = opts[:default_profile]
+          @secure_ssl = !!opts[:secure_ssl]
         end
 
         def self.binary_path
@@ -81,6 +81,10 @@ module Selenium
             args << "--user-data-dir=#{Platform.wrap_in_quotes_if_necessary tmp_profile_dir}"
           end
 
+          unless @secure_ssl
+            args << "--ignore-certificate-errors"
+          end
+
           args << server_url
 
           @process = ChildProcess.new(*args).start
@@ -91,23 +95,23 @@ module Selenium
         end
 
         def tmp_extension_dir
-          @tmp_extension_dir ||= begin
+          @tmp_extension_dir ||= (
             dir = Dir.mktmpdir("webdriver-chrome-extension")
             Platform.make_writable(dir)
             FileReaper << dir
 
             dir
-          end
+          )
         end
 
         def tmp_profile_dir
-          @tmp_profile_dir ||= begin
+          @tmp_profile_dir ||= (
             dir = Dir.mktmpdir("webdriver-chrome-profile")
             Platform.make_writable(dir)
             FileReaper << dir
 
             dir
-          end
+          )
         end
 
         class WindowsLauncher < Launcher
@@ -149,7 +153,10 @@ module Selenium
 
         class MacOSXLauncher < UnixLauncher
           def self.possible_paths
-            ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome", "#{Platform.home}/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"]
+            [
+             "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+             "#{Platform.home}/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+            ]
           end
         end
 

data/lib/selenium/webdriver/driver.rb

@@ -229,16 +229,22 @@ module Selenium
 
       alias_method :script, :execute_script
 
-      # Get the first element matching the given id.
+      # Get the first element matching the given selector. If given a
+      # String or Symbol, it will be used as the id of the element.
       #
-      # @param [String] id
+      # @param  [String,Hash] id or selector
       # @return [WebDriver::Element]
       #
-      #   driver['someElementId'] #=> #<WebDriver::Element:0x1011c3b88>
+      #   driver['someElementId']    #=> #<WebDriver::Element:0x1011c3b88>
+      #   driver[:tag_name => 'div'] #=> #<WebDriver::Element:0x1011c3b88>
       #
 
-      def [](id)
-        find_element :id, id
+      def [](sel)
+        if sel.kind_of?(String) || sel.kind_of?(Symbol)
+          sel = { :id => sel }
+        end
+
+        find_element sel
       end
 
 
@@ -254,4 +260,4 @@ module Selenium
 
     end # Driver
   end # WebDriver
-end # Selenium
+end # Selenium

data/lib/selenium/webdriver/element.rb

@@ -19,6 +19,15 @@ module Selenium
         '#<%s:0x%x id=%s tag_name=%s>' % [self.class, hash*2, @id.inspect, tag_name.inspect]
       end
 
+      def ==(other)
+        other.kind_of?(self.class) && bridge.elementEquals(self, other)
+      end
+      alias_method :eql?, :==
+
+      def hash
+        ref.hash
+      end
+
       #
       # Click the element
       #

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

@@ -105,7 +105,7 @@ module Selenium
                       when :linux, :unix
                         Platform.find_binary("firefox3", "firefox2", "firefox") || "/usr/bin/firefox"
                       else
-                        raise "Unknown platform: #{Platform.os}"
+                        raise Error::WebDriverError, "unknown platform: #{Platform.os}"
                       end
 
             unless File.file?(@path)

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

@@ -11,14 +11,14 @@ module Selenium
         STABLE_CONNECTION_TIMEOUT = 60
 
         def initialize(binary, port = DEFAULT_PORT, profile = DEFAULT_PROFILE_NAME)
-          @binary       = binary
-          @port         = port.to_i
+          @binary = binary
+          @port   = port.to_i
 
           if profile.kind_of? Profile
             @profile = profile
           else
             @profile_name = profile
-            @profile      = nil
+            @profile = nil
           end
 
           # need to be really specific about what host to use
@@ -137,14 +137,14 @@ module Selenium
             @binary.create_base_profile @profile_name
             Profile.ini.refresh
             existing = Profile.from_name @profile_name
-            raise "unable to find or create new profile" unless existing
+            raise Error::WebDriverError, "unable to find or create new profile" unless existing
           end
 
           @profile = existing
         end
 
         def assert_profile
-          raise "must create_profile first" if @profile.nil?
+          raise Error::WebDriverError, "must create_profile first" unless @profile
         end
 
       end # Launcher

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

@@ -8,8 +8,8 @@ module Selenium
         EM_NAMESPACE_URI         = "http://www.mozilla.org/2004/em-rdf#"
         WEBDRIVER_EXTENSION_PATH = File.expand_path("#{WebDriver.root}/selenium/webdriver/firefox/extension/webdriver.xpi")
 
-        attr_reader :name, :directory
-        attr_writer :secure_ssl, :native_events, :load_no_focus_lib
+        attr_reader   :name, :directory
+        attr_writer   :secure_ssl, :native_events, :load_no_focus_lib
         attr_accessor :port
 
         class << self
@@ -131,8 +131,7 @@ module Selenium
             root = ZipHelper.unzip(path)
           end
 
-          id       = read_id_from_install_rdf(root)
-          ext_path = File.join(extensions_dir, id)
+          ext_path = File.join extensions_dir, read_id_from_install_rdf(root)
 
           FileUtils.rm_rf ext_path
           FileUtils.mkdir_p File.dirname(ext_path), :mode => 0700
@@ -208,12 +207,12 @@ module Selenium
         end
 
         def write_prefs(prefs)
-          File.open(user_prefs_path, "w") do |file|
+          File.open(user_prefs_path, "w") { |file|
             prefs.each do |key, value|
               p key => value if $DEBUG
               file.puts %{user_pref("#{key}", #{value});}
             end
-          end
+          }
         end
 
         OVERRIDABLE_PREFERENCES = {

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

@@ -350,14 +350,17 @@ module Selenium
         end
 
         def getElementValue(element_pointer)
-          getElementAttribute(element_pointer, 'value').gsub("\r\n", "\n")
+          val = getElementAttribute(element_pointer, 'value')
+          val.gsub("\r\n", "\n") if val
         end
 
         def getElementText(element_pointer)
-          create_string do |string_pointer|
+          val = create_string do |string_pointer|
             check_error_code Lib.wdeGetText(element_pointer, string_pointer),
                              "unable to get text"
-          end.gsub("\r\n", "\n")
+          end
+
+          val.gsub("\r\n", "\n") if val
         end
 
         def sendKeysToElement(element_pointer, string)
@@ -434,6 +437,10 @@ module Selenium
           raise NotImplementedError
         end
 
+        def elementEquals(element, other)
+          executeScript "return arguments[0] === arguments[1]", element, other
+        end
+
         def dragElement(element_pointer, right_by, down_by)
           # TODO: check return values?
           hwnd                = FFI::MemoryPointer.new :pointer

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

@@ -339,6 +339,10 @@ module Selenium
           execute :dragElement, {:id => element}, :x => rigth_by, :y => down_by
         end
 
+        def elementEquals(element, other)
+          execute :elementEquals, :id => element.ref, :other => other.ref
+        end
+
         private
 
         def find_element_by(how, what, parent = nil)

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

@@ -16,11 +16,22 @@ module Selenium
         end
 
         def error
-          Error.for_code @payload['status']
+          klass = Error.for_code(@payload['status']) || return
+
+          ex = klass.new(error_message)
+          ex.set_backtrace(caller)
+          add_backtrace ex
+
+          ex
         end
 
         def error_message
-          @payload['value']['message']
+          val = @payload['value']
+          msg = val['message'] or return ""
+
+          msg << " (#{ val['class'] })" if val['class']
+
+          msg
         end
 
         def [](key)
@@ -32,13 +43,31 @@ module Selenium
         def assert_ok
           if @code.nil? || @code >= 400
             if e = error()
-              raise(e, error_message)
+              raise e
             else
               raise Error::ServerError, self
             end
           end
         end
 
+        def add_backtrace(ex)
+          return unless server_trace = @payload['value']['stackTrace']
+
+          backtrace = server_trace.map do |frame|
+            file = frame['fileName']
+            line = frame['lineNumber']
+            meth = frame['methodName']
+
+            if class_name = frame['className']
+              file = "#{class_name}(#{file})"
+            end
+
+            "[remote server] #{file}:#{line}:in `#{meth}'"
+          end
+
+          ex.set_backtrace(backtrace + ex.backtrace)
+        end
+
       end # Response
     end # Remote
   end # WebDriver

data/lib/selenium/webdriver/zip_helper.rb

@@ -2,12 +2,9 @@ require 'zip/zip'
 
 module Selenium
   module WebDriver
-
     module ZipHelper
 
-      module_function
-
-      def unzip(path)
+      def self.unzip(path)
         destination = Dir.mktmpdir("unzip")
         FileReaper << destination
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 27
-  version: 0.0.27
+    - 28
+  version: 0.0.28
 platform: ruby
 authors: 
   - Jari Bakken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +02:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency