selenium-webdriver 0.0.12 → 0.0.13

data/common/src/rb/README

@@ -9,6 +9,7 @@ gem install selenium-webdriver
 = LINKS
 
 * http://gemcutter.org/gems/selenium-webdriver
+* http://selenium.googlecode.com/svn/trunk/docs/api/rb/index.html
 * http://code.google.com/p/selenium/wiki/RubyBindings
 * http://code.google.com/p/selenium/issues/list
 

data/common/src/rb/lib/selenium/webdriver/child_process.rb

@@ -44,6 +44,8 @@ module Selenium
       def wait
         raise "called wait with no pid" unless @pid
         Process.waitpid2 @pid
+      rescue Errno::ECHILD
+        nil
       end
 
       def kill

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

@@ -8,10 +8,14 @@ module Selenium
           @binary     = Binary.new
           @launcher   = Launcher.new(
             @binary,
-            opts[:port]    || DEFAULT_PORT,
-            opts[:profile] || DEFAULT_PROFILE_NAME
+            opts.delete(:port)    || DEFAULT_PORT,
+            opts.delete(:profile) || DEFAULT_PROFILE_NAME
           )
 
+          unless opts.empty?
+            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
+          end
+
           @launcher.launch
           @connection = @launcher.connection
           @context    = newSession
@@ -28,7 +32,7 @@ module Selenium
         def quit
           @connection.quit
           @binary.wait rescue nil # might raise on windows
-          
+
           nil
         end
 

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

@@ -1,7 +1,6 @@
 module Selenium
   module WebDriver
     module Remote
-      DEBUG = $VERBOSE == true
 
       COMMANDS = {}
 
@@ -16,7 +15,7 @@ module Selenium
         include BridgeHelper
 
         DEFAULT_OPTIONS = {
-          :server_url           => "http://localhost:7055/",
+          :url                  => "http://localhost:7055/",
           :http_client          => DefaultHttpClient,
           :desired_capabilities => Capabilities.firefox
         }
@@ -46,14 +45,27 @@ module Selenium
         #
         # Initializes the bridge with the given server URL.
         #
-        # @param server_url [String] base URL for all commands.  FIXME: Note that a trailing '/' is very important!
+        # @param url         [String] url for the remote server
+        # @param http_client [Class] an HTTP client class that implements the same interface as DefaultHttpClient
+        # @param desired_capabilities [Capabilities] an instance of Remote::Capabilities describing the capabilities you want
         #
 
         def initialize(opts = {})
-          opts          = DEFAULT_OPTIONS.merge(opts)
+          opts                 = DEFAULT_OPTIONS.merge(opts)
+          http_client_class    = opts.delete(:http_client)
+          desired_capabilities = opts.delete(:desired_capabilities)
+          url                  = opts.delete(:url)
+
+          unless opts.empty?
+            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
+          end
+
+          uri = URI.parse(url)
+          uri.path += "/" unless uri.path =~ /\/$/
+
           @context      = "context"
-          @http         = opts[:http_client].new URI.parse(opts[:server_url])
-          @capabilities = create_session opts[:desired_capabilities]
+          @http         = http_client_class.new uri
+          @capabilities = create_session(desired_capabilities)
         end
 
         def browser
@@ -370,7 +382,7 @@ module Selenium
             raise ArgumentError, "#{opts.inspect} invalid for #{command.inspect}"
           end
 
-          puts "-> #{verb.to_s.upcase} #{path}" if DEBUG
+          puts "-> #{verb.to_s.upcase} #{path}" if $DEBUG
           http.call verb, path, *args
         end
 

data/remote/client/src/rb/lib/selenium/webdriver/remote/default_http_client.rb

@@ -5,7 +5,6 @@ module Selenium
     module Remote
       class DefaultHttpClient
         CONTENT_TYPE = "application/json"
-        DEBUG        = $VERBOSE == true
 
         class RetryException < StandardError; end
 
@@ -21,7 +20,7 @@ module Selenium
           if args.any?
             headers.merge!("Content-Type" => "#{CONTENT_TYPE}; charset=utf-8")
             payload = args.to_json
-            puts "   >>> #{payload}" if DEBUG
+            puts "   >>> #{payload}" if $DEBUG
           end
 
           begin
@@ -52,7 +51,7 @@ module Selenium
         end
 
         def create_response(res)
-          puts "<- #{res.body}\n" if DEBUG
+          puts "<- #{res.body}\n" if $DEBUG
           if res.content_type == CONTENT_TYPE
             Response.new do |r|
               r.code         = res.code.to_i

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

@@ -30,7 +30,10 @@ module Selenium
         def assert_ok
           if @code.nil? || @code > 400
             if e = error()
-              raise Error.for_remote_class(e['class']), e['message']
+              raise(
+                Error.for_remote_class(e['class']),
+                e['message'] || self
+              )
             else
               raise ServerError, self
             end

data/remote/client/src/rb/lib/selenium/webdriver/remote/server_error.rb

@@ -6,8 +6,8 @@ module Selenium
         def initialize(response)
           return super(response) if response.kind_of?(String)
 
-          if response.error
-            super(response.error["message"])
+          if response.respond_to?(:error) && err = response.error
+            super(err["message"] || err['class'])
           else
             super("status code #{response.code}")
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Jari Bakken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 +01:00
+date: 2009-12-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency