selenium-webdriver 0.2.0 → 0.2.1

data/CHANGES

@@ -1,3 +1,18 @@
+0.2.1 (2011-06-01)
+==================
+
+* Allow passing custom command line switches to Chrome (requires today's release of the Chrome server)
+* Avoid mutating arguments to find_element (issue #1273).
+* Avoid conflicts when SUT modifies Array.prototype
+* Allow setting arbitrary capabilities by adding Capabilities#[]=
+* The Chrome driver is extended with TakesScreenshot.
+* IE driver detects bad protected mode settings.
+* Firefox driver no longer considers opacity when determining visibility.
+* Fix for ActionBuilder#move_by.
+* Treat Errno::EBADF as an indication that we failed to grab the socket lock (issue #1611).
+* Ensure Firefox launches don't hang on some Ruby versions (by improving Selenium::WebDriver::SocketPoller).
+* Various internal driver improvements.
+
 0.2.0 (2011-04-22)
 ==================
 

data/lib/selenium-client.rb

@@ -1,2 +1,2 @@
-require "selenium/client"
+require 'selenium/client'
 

data/lib/selenium-webdriver.rb

@@ -1 +1 @@
-require "selenium/webdriver"
+require 'selenium/webdriver'

data/lib/selenium/client.rb

@@ -1,7 +1,7 @@
 require 'net/http'
 require 'uri'
 require 'cgi'
-require "digest/md5"
+require 'digest/md5'
 require 'fileutils'
 require 'tmpdir'
 

data/lib/selenium/server.rb

@@ -1,6 +1,6 @@
-require "childprocess"
-require "selenium/webdriver/common/socket_poller"
-require "net/http"
+require 'childprocess'
+require 'selenium/webdriver/common/socket_poller'
+require 'net/http'
 
 module Selenium
 

data/lib/selenium/webdriver.rb

@@ -1,7 +1,7 @@
-require "childprocess"
-require "tmpdir"
-require "fileutils"
-require "date"
+require 'childprocess'
+require 'tmpdir'
+require 'fileutils'
+require 'date'
 require 'base64'
 
 have_lib = lambda { |lib|
@@ -13,7 +13,7 @@ have_lib = lambda { |lib|
   end
 }
 
-unless have_lib["yajl/json_gem"] || have_lib["json"]
+unless have_lib['yajl/json_gem'] || have_lib['json']
   raise LoadError, <<-END
 
        You need to require rubygems or install one of these gems:
@@ -26,7 +26,7 @@ unless have_lib["yajl/json_gem"] || have_lib["json"]
   END
 end
 
-require "selenium/webdriver/common"
+require 'selenium/webdriver/common'
 
 module Selenium
   module WebDriver

data/lib/selenium/webdriver/android.rb

@@ -6,4 +6,4 @@ module Selenium
   end # WebDriver
 end # Selenium
 
-require "selenium/webdriver/android/bridge"
+require 'selenium/webdriver/android/bridge'

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

@@ -10,7 +10,7 @@ module Selenium
             super
           else
             super(
-              :url                  => DEFAULT_URL,
+              :url => DEFAULT_URL,
               :desired_capabilities => capabilities
             )
           end

data/lib/selenium/webdriver/chrome.rb

@@ -1,7 +1,7 @@
 require 'net/http'
 
-require "selenium/webdriver/chrome/service"
-require "selenium/webdriver/chrome/bridge"
+require 'selenium/webdriver/chrome/service'
+require 'selenium/webdriver/chrome/bridge'
 
 
 module Selenium

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

@@ -6,19 +6,30 @@ module Selenium
       class Bridge < Remote::Bridge
 
         def initialize(opts = {})
-          # TODO: pass options to Chrome::Service
           http_client = opts.delete(:http_client)
+          switches    = opts.delete(:switches)
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
+          caps = Remote::Capabilities.chrome
+
+          if switches
+            unless switches.kind_of? Array
+              raise ArgumentError, ":switches must be an Array of Strings"
+            end
+
+            caps.merge! 'chrome.switches' => switches.map { |e| e.to_s }
+          end
+
+
           @service = Service.default_service
           @service.start
 
           remote_opts = {
             :url                  => @service.uri,
-            :desired_capabilities => :chrome
+            :desired_capabilities => caps
           }
 
           remote_opts.merge!(:http_client => http_client) if http_client
@@ -31,7 +42,7 @@ module Selenium
         end
 
         def driver_extensions
-          []
+          [DriverExtensions::TakesScreenshot]
         end
 
         def capabilities

data/lib/selenium/webdriver/common.rb

@@ -1,26 +1,26 @@
-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/proxy"
-require "selenium/webdriver/common/file_reaper"
-require "selenium/webdriver/common/socket_poller"
-require "selenium/webdriver/common/port_prober"
-require "selenium/webdriver/common/zipper"
-require "selenium/webdriver/common/wait"
-require "selenium/webdriver/common/alert"
-require "selenium/webdriver/common/mouse"
-require "selenium/webdriver/common/keyboard"
-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/search_context"
-require "selenium/webdriver/common/action_builder"
-require "selenium/webdriver/common/driver_extensions/takes_screenshot"
-require "selenium/webdriver/common/driver_extensions/rotatable"
-require "selenium/webdriver/common/driver_extensions/has_input_devices"
-require "selenium/webdriver/common/keys"
-require "selenium/webdriver/common/bridge_helper"
-require "selenium/webdriver/common/driver"
-require "selenium/webdriver/common/element"
+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/proxy'
+require 'selenium/webdriver/common/file_reaper'
+require 'selenium/webdriver/common/socket_poller'
+require 'selenium/webdriver/common/port_prober'
+require 'selenium/webdriver/common/zipper'
+require 'selenium/webdriver/common/wait'
+require 'selenium/webdriver/common/alert'
+require 'selenium/webdriver/common/mouse'
+require 'selenium/webdriver/common/keyboard'
+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/search_context'
+require 'selenium/webdriver/common/action_builder'
+require 'selenium/webdriver/common/driver_extensions/takes_screenshot'
+require 'selenium/webdriver/common/driver_extensions/rotatable'
+require 'selenium/webdriver/common/driver_extensions/has_input_devices'
+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/common/action_builder.rb

@@ -13,7 +13,7 @@ module Selenium
 
       def key_down(*args)
         if args.first.kind_of? Element
-          @actions << [:mouse, :click, args.shift]
+          @actions << [:mouse, :click, [args.shift]]
         end
 
         @actions << [:keyboard, :press, args]
@@ -22,7 +22,7 @@ module Selenium
 
       def key_up(*args)
         if args.first.kind_of? Element
-          @actions << [:mouse, :click, args.shift]
+          @actions << [:mouse, :click, [args.shift]]
         end
 
         @actions << [:keyboard, :release, args]
@@ -31,7 +31,7 @@ module Selenium
 
       def send_keys(*args)
         if args.first.kind_of? Element
-          @actions << [:mouse, :click, args.shift]
+          @actions << [:mouse, :click, [args.shift]]
         end
 
         @actions << [:keyboard, :send_keys, args]
@@ -39,42 +39,42 @@ module Selenium
       end
 
       def click_and_hold(element)
-        @actions << [:mouse, :down, element]
+        @actions << [:mouse, :down, [element]]
         self
       end
 
       def release(element = nil)
-        @actions << [:mouse, :up, element]
+        @actions << [:mouse, :up, [element]]
         self
       end
 
       def click(element = nil)
-        @actions << [:mouse, :click, element]
+        @actions << [:mouse, :click, [element]]
         self
       end
 
       def double_click(element = nil)
-        @actions << [:mouse, :double_click, element]
+        @actions << [:mouse, :double_click, [element]]
         self
       end
 
       def move_to(element, down_by = nil, right_by = nil)
         if down_by && right_by
-          @actions << [:mouse, :move_to, element, down_by, right_by]
+          @actions << [:mouse, :move_to, [element, down_by, right_by]]
         else
-          @actions << [:mouse, :move_to, element]
+          @actions << [:mouse, :move_to, [element]]
         end
 
         self
       end
 
       def move_by(down_by, right_by)
-        @actions << [:mouse, :move_by, down_by, right_by]
+        @actions << [:mouse, :move_by, [down_by, right_by]]
         self
       end
 
       def context_click(element = nil)
-        @actions << [:mouse, :context_click, element]
+        @actions << [:mouse, :context_click, [element]]
         self
       end
 

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

@@ -261,7 +261,14 @@ module Selenium
         find_element sel
       end
 
+      def browser
+        bridge.browser
+      end
 
+      def capabilities
+        bridge.capabilities
+      end
+      
       #
       # @api private
       # @see SearchContext
@@ -271,14 +278,6 @@ module Selenium
         nil
       end
 
-      def browser
-        bridge.browser
-      end
-
-      def capabilities
-        bridge.capabilities
-      end
-
       private
 
       def bridge

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

@@ -1,5 +1,5 @@
-require "rbconfig"
-require "socket"
+require 'rbconfig'
+require 'socket'
 
 module Selenium
   module WebDriver

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

@@ -20,7 +20,7 @@ module Selenium
       #
       # 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 
+      # 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
@@ -75,11 +75,13 @@ module Selenium
           args
         when 1
           arg = args.first
+
           unless arg.respond_to?(:shift)
             raise ArgumentError, "expected #{arg.inspect}:#{arg.class} to respond to #shift"
           end
 
-          arr = arg.shift
+          # this will be a single-entry hash, so use #shift over #first or #[]
+          arr = arg.dup.shift
           unless arr.size == 2
             raise ArgumentError, "expected #{arr.inspect} to have 2 elements"
           end

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

@@ -1,5 +1,5 @@
-require "selenium/webdriver/common/platform"
-require "socket"
+require 'selenium/webdriver/common/platform'
+require 'socket'
 
 module Selenium
   module WebDriver
@@ -36,17 +36,47 @@ module Selenium
 
       private
 
-      SOCKET_ERRORS = [Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError]
-      SOCKET_ERRORS << Errno::EPERM if Platform.cygwin?
+      CONNECT_TIMEOUT = 5
 
-      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 *SOCKET_ERRORS => e
-        $stderr.puts [@host, @port].inspect if $DEBUG
-        false
+      NOT_CONNECTED_ERRORS = [Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError]
+      NOT_CONNECTED_ERRORS << Errno::EPERM if Platform.cygwin?
+
+      CONNECTED_ERRORS = [Errno::EISCONN]
+      CONNECTED_ERRORS << Errno::EINVAL if Platform.win?
+
+      if Platform.jruby?
+        # we use a plain TCPSocket here since JRuby has issues select()ing on a connecting socket
+        # see http://jira.codehaus.org/browse/JRUBY-5165
+        def listening?
+          TCPSocket.new(@host, @port).close
+          true
+        rescue *NOT_CONNECTED_ERRORS
+          false
+        end
+      else
+        def listening?
+          addr     = Socket.getaddrinfo(@host, @port, Socket::AF_INET, Socket::SOCK_STREAM)
+          sock     = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+          sockaddr = Socket.pack_sockaddr_in(@port, addr[0][3])
+
+          begin
+            sock.connect_nonblock sockaddr
+          rescue Errno::EINPROGRESS
+            if IO.select(nil, [sock], nil, CONNECT_TIMEOUT)
+              retry
+            else
+              raise Errno::ECONNREFUSED
+            end
+          rescue *CONNECTED_ERRORS
+            # yay!
+          end
+
+          sock.close
+          true
+        rescue *NOT_CONNECTED_ERRORS => e
+          $stderr.puts [@host, @port].inspect if $DEBUG
+          false
+        end
       end
 
       def with_timeout(&blk)

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

@@ -11,7 +11,7 @@ module Selenium
       #
 
       def implicit_wait=(seconds)
-        @bridge.setImplicitWaitTimeout seconds * 1000
+        @bridge.setImplicitWaitTimeout Integer(seconds * 1000)
       end
 
       #
@@ -21,7 +21,7 @@ module Selenium
       #
 
       def script_timeout=(seconds)
-        @bridge.setScriptTimeout seconds * 1000
+        @bridge.setScriptTimeout Integer(seconds * 1000)
       end
 
     end # Timeouts

data/lib/selenium/webdriver/firefox.rb

@@ -1,15 +1,15 @@
-require "timeout"
-require "socket"
-require "rexml/document"
+require 'timeout'
+require 'socket'
+require 'rexml/document'
 
-require "selenium/webdriver/firefox/util"
-require "selenium/webdriver/firefox/extension"
-require "selenium/webdriver/firefox/socket_lock"
-require "selenium/webdriver/firefox/binary"
-require "selenium/webdriver/firefox/profiles_ini"
-require "selenium/webdriver/firefox/profile"
-require "selenium/webdriver/firefox/launcher"
-require "selenium/webdriver/firefox/bridge"
+require 'selenium/webdriver/firefox/util'
+require 'selenium/webdriver/firefox/extension'
+require 'selenium/webdriver/firefox/socket_lock'
+require 'selenium/webdriver/firefox/binary'
+require 'selenium/webdriver/firefox/profiles_ini'
+require 'selenium/webdriver/firefox/profile'
+require 'selenium/webdriver/firefox/launcher'
+require 'selenium/webdriver/firefox/bridge'
 
 module Selenium
   module WebDriver

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

@@ -133,7 +133,7 @@ module Selenium
           end
 
           def windows_registry_path
-            require "win32/registry"
+            require 'win32/registry'
 
             lm = Win32::Registry::HKEY_LOCAL_MACHINE
             lm.open("SOFTWARE\\Mozilla\\Mozilla Firefox") do |reg|

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

@@ -4,8 +4,6 @@ module Selenium
 
       # @api private
       class Extension
-        EM_NAMESPACE_URI = "http://www.mozilla.org/2004/em-rdf#" # not used?
-
         def initialize(path)
           unless File.exist?(path)
             raise Error::WebDriverError, "could not find extension at #{path.inspect}"

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

@@ -50,7 +50,7 @@ module Selenium
         end
 
         def create_profile
-          fetch_profile if @profile.nil?
+          fetch_profile unless @profile
 
           @profile.add_webdriver_extension
           @profile.port = @port
@@ -64,12 +64,14 @@ module Selenium
 
         def start_silent_and_wait
           assert_profile
+
           @binary.start_with @profile, @profile_dir, "-silent"
           @binary.wait
         end
 
         def connect_until_stable
           poller = SocketPoller.new(@host, @port, STABLE_CONNECTION_TIMEOUT)
+
           unless poller.connected?
             @binary.quit
             raise Error::WebDriverError, "unable to obtain stable firefox connection in #{STABLE_CONNECTION_TIMEOUT} seconds (#{@host}:#{@port})"
@@ -79,7 +81,8 @@ module Selenium
         def fetch_profile
           if @profile_name
             @profile = Profile.from_name @profile_name
-            if @profile.nil?
+
+            unless @profile
               raise Error::WebDriverError, "unable to find profile named: #{@profile_name.inspect}"
             end
           else

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

@@ -3,8 +3,6 @@ module Selenium
     module Firefox
       class Profile
 
-        ANONYMOUS_PROFILE_NAME   = "WEBDRIVER_ANONYMOUS_PROFILE"
-        EXTENSION_NAME           = "fxdriver@googlecode.com"
         WEBDRIVER_EXTENSION_PATH = File.expand_path("#{WebDriver.root}/selenium/webdriver/firefox/extension/webdriver.xpi")
         WEBDRIVER_PREFS          = {
           :native_events    => 'webdriver_enable_native_events',

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

@@ -46,7 +46,7 @@ module Selenium
           ChildProcess.close_on_exec @server
 
           true
-        rescue SocketError, Errno::EADDRINUSE => ex
+        rescue SocketError, Errno::EADDRINUSE, Errno::EBADF => ex
           $stderr.puts "#{self}: #{ex.message}" if $DEBUG
           false
         end

data/lib/selenium/webdriver/ie.rb

@@ -13,7 +13,7 @@ module Selenium
   end
 end
 
-require "ffi"
+require 'ffi'
 
-require "selenium/webdriver/ie/server"
-require "selenium/webdriver/ie/bridge"
+require 'selenium/webdriver/ie/server'
+require 'selenium/webdriver/ie/bridge'

data/lib/selenium/webdriver/iphone.rb

@@ -6,4 +6,4 @@ module Selenium
   end # WebDriver
 end # Selenium
 
-require "selenium/webdriver/iphone/bridge"
+require 'selenium/webdriver/iphone/bridge'

data/lib/selenium/webdriver/remote.rb

@@ -1,12 +1,12 @@
-require "uri"
+require 'uri'
 
-require "selenium/webdriver/remote/capabilities"
-require "selenium/webdriver/remote/bridge"
-require "selenium/webdriver/remote/server_error"
-require "selenium/webdriver/remote/response"
-require "selenium/webdriver/remote/commands"
-require "selenium/webdriver/remote/http/common"
-require "selenium/webdriver/remote/http/default"
+require 'selenium/webdriver/remote/capabilities'
+require 'selenium/webdriver/remote/bridge'
+require 'selenium/webdriver/remote/server_error'
+require 'selenium/webdriver/remote/response'
+require 'selenium/webdriver/remote/commands'
+require 'selenium/webdriver/remote/http/common'
+require 'selenium/webdriver/remote/http/default'
 
 module Selenium
   module WebDriver

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

@@ -7,17 +7,28 @@ module Selenium
       #
       class Capabilities
 
-        attr_reader :proxy
-
-        attr_accessor :css_selectors_enabled,
-                      :javascript_enabled,
-                      :native_events,
-                      :platform,
-                      :takes_screenshot,
-                      :rotatable,
-                      :version,
-                      :browser_name,
-                      :firefox_profile
+        DEFAULTS = {
+          :browser_name          => "",
+          :version               => "",
+          :platform              => :any,
+          :javascript_enabled    => false,
+          :css_selectors_enabled => false,
+          :takes_screenshot      => false,
+          :native_events         => false,
+          :rotatable             => false,
+          :firefox_profile       => nil,
+          :proxy                 => nil
+        }
+
+        DEFAULTS.each_key do |key|
+          define_method key do
+            @capabilities.fetch(key)
+          end
+
+          define_method "#{key}=" do |value|
+            @capabilities[key] = value
+          end
+        end
 
         alias_method :css_selectors_enabled?, :css_selectors_enabled
         alias_method :javascript_enabled?   , :javascript_enabled
@@ -92,17 +103,23 @@ module Selenium
           #
 
           def json_create(data)
-            new(
-              :browser_name          => data["browserName"],
-              :version               => data["version"],
-              :platform              => data["platform"].downcase.to_sym,
-              :javascript_enabled    => data["javascriptEnabled"],
-              :css_selectors_enabled => data["cssSelectorsEnabled"],
-              :takes_screenshot      => data["takesScreenshot"],
-              :native_events         => data["nativeEvents"],
-              :rotatable             => data["rotatable"],
-              :proxy                 => (Proxy.json_create(data['proxy']) if data['proxy'])
-            )
+            data = data.dup
+
+            caps = new
+            caps.browser_name          = data.delete("browserName")
+            caps.version               = data.delete("version")
+            caps.platform              = data.delete("platform").downcase.to_sym
+            caps.javascript_enabled    = data.delete("javascriptEnabled")
+            caps.css_selectors_enabled = data.delete("cssSelectorsEnabled")
+            caps.takes_screenshot      = data.delete("takesScreenshot")
+            caps.native_events         = data.delete("nativeEvents")
+            caps.rotatable             = data.delete("rotatable")
+            caps.proxy                 = Proxy.json_create(data['proxy']) if data.has_key?('proxy')
+
+            # any remaining pairs will be added as is, with no conversion
+            caps.merge!(data)
+
+            caps
           end
         end
 
@@ -112,36 +129,49 @@ module Selenium
         # @option :javascript_enabled     [Boolean] does the driver have javascript enabled?
         # @option :css_selectors_enabled  [Boolean] does the driver support CSS selectors?
         # @option :takes_screenshot       [Boolean] can this driver take screenshots?
-        # @option :native_events         [Boolean] does this driver use native events?
-        # @option :proxy                 [Selenium::WebDriver::Proxy, Hash] proxy configuration
+        # @option :native_events          [Boolean] does this driver use native events?
+        # @option :proxy                  [Selenium::WebDriver::Proxy, Hash] proxy configuration
         #
         # Firefox-specific options:
         #
-        # @option :firefox_profile       [Selenium::WebDriver::Firefox::Profile] the firefox profile to use
+        # @option :firefox_profile        [Selenium::WebDriver::Firefox::Profile] the firefox profile to use
         #
         # @api public
         #
 
         def initialize(opts = {})
-          @browser_name          = opts[:browser_name]          || ""
-          @version               = opts[:version]               || ""
-          @platform              = opts[:platform]              || :any
-          @javascript_enabled    = opts[:javascript_enabled]    || false
-          @css_selectors_enabled = opts[:css_selectors_enabled] || false
-          @takes_screenshot      = opts[:takes_screenshot]      || false
-          @native_events         = opts[:native_events]         || false
-          @rotatable             = opts[:rotatable]             || false
-          @firefox_profile       = opts[:firefox_profile]
-
-          self.proxy             = opts[:proxy]
+          @capabilities = DEFAULTS.merge(opts)
+          self.proxy    = opts.delete(:proxy)
+        end
+
+        #
+        # Allows setting arbitrary capabilities.
+        #
+
+        def []=(key, value)
+          @capabilities[key] = value
+        end
+
+        def [](key)
+          @capabilities[key]
+        end
+
+        def merge!(other)
+          if other.respond_to?(:capabilities) && other.capabilities.kind_of?(Hash)
+            @capabilities.merge! other.capabilities
+          elsif other.kind_of? Hash
+            @capabilities.merge! other
+          else
+            raise ArgumentError, "argument should be a Hash or implement #capabilities"
+          end
         end
 
         def proxy=(proxy)
           case proxy
           when Hash
-            @proxy = Proxy.new(proxy)
+            @capabilities[:proxy] = Proxy.new(proxy)
           when Proxy, nil
-            @proxy = proxy
+            @capabilities[:proxy] = proxy
           else
             raise TypeError, "expected Hash or #{Proxy.name}, got #{proxy.inspect}:#{proxy.class}"
           end
@@ -151,19 +181,24 @@ module Selenium
         #
 
         def as_json(opts = nil)
-          hash = {
-            "browserName"         => browser_name,
-            "version"             => version,
-            "platform"            => platform.to_s.upcase,
-            "javascriptEnabled"   => javascript_enabled?,
-            "cssSelectorsEnabled" => css_selectors_enabled?,
-            "takesScreenshot"     => takes_screenshot?,
-            "nativeEvents"        => native_events?,
-            "rotatable"           => rotatable?,
-          }
-
-          hash["proxy"]           = proxy.as_json if proxy
-          hash['firefox_profile'] = firefox_profile.as_json['zip'] if firefox_profile
+          hash = {}
+
+          @capabilities.each do |key, value|
+            case key
+            when :platform
+              hash['platform'] = value.to_s.upcase
+            when :firefox_profile
+              hash['firefox_profile'] = value.as_json['zip'] if value
+            when :proxy
+              hash['proxy'] = value.as_json if value
+            when String
+              hash[key] = value
+            when Symbol
+              hash[camel_case(key.to_s)] = value
+            else
+              raise TypeError, "expected String or Symbol, got #{key.inspect}:#{key.class} / #{value.inspect}"
+            end
+          end
 
           hash
         end
@@ -178,6 +213,18 @@ module Selenium
         end
         alias_method :eql?, :==
 
+        protected
+
+        def capabilities
+          @capabilities
+        end
+
+        private
+
+        def camel_case(str)
+          str.gsub(/_([a-z])/) { $1.upcase }
+        end
+
       end # Capabilities
     end # Remote
   end # WebDriver

data/lib/selenium/webdriver/remote/http/default.rb

@@ -1,4 +1,4 @@
-require "net/https"
+require 'net/https'
 
 module Selenium
   module WebDriver

data/lib/selenium/webdriver/remote/http/persistent.rb

@@ -1,4 +1,4 @@
-require "net/http/persistent"
+require 'net/http/persistent'
 
 module Selenium
   module WebDriver

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.0
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jari Bakken
@@ -10,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 Z
+date: 2011-06-01 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -20,6 +26,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -31,6 +40,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -42,6 +54,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 1
+        - 7
         version: 0.1.7
   type: :runtime
   version_requirements: *id003
@@ -53,6 +70,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 0
+        - 7
         version: 1.0.7
   type: :runtime
   version_requirements: *id004
@@ -64,6 +86,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
   type: :development
   version_requirements: *id005
@@ -75,6 +101,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
   type: :development
   version_requirements: *id006
@@ -86,6 +116,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
   type: :development
   version_requirements: *id007
@@ -178,6 +213,7 @@ files:
 - lib/selenium-webdriver.rb
 - CHANGES
 - README
+has_rdoc: true
 homepage: http://selenium.googlecode.com
 licenses: []
 
@@ -191,17 +227,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The next generation developer focused tool for automated testing of webapps