selenium-webdriver 0.1.0 → 0.1.1

data/CHANGES

@@ -1,4 +1,13 @@
-0.1.0 (2010-11-??)
+0.1.1 (2010-11-29)
+==================
+
+* Fix for Chrome.path=
+* Remote drivers always add Content-Length for POST requests (thanks joshuachisholm)
+* Fix for JS execution bug in the IE driver
+* Add ability to specify a proxy on the Http::Default client.
+* The remote drivers' :http_client argument now take a configured instance.
+
+0.1.0 (2010-11-11)
 ===================
 
 * selenium-client code (Se1/RC client) is now included in the gem (require "selenium/client").

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

@@ -6,7 +6,7 @@ module Selenium
       class Bridge < Remote::Bridge
 
         def initialize(opts = {})
-          @launcher = Launcher.launcher(
+          @launcher = Launcher.new(
             :default_profile => opts[:default_profile],
             :secure_ssl      => opts[:secure_ssl]
           )

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

@@ -8,21 +8,6 @@ module Selenium
 
         attr_reader :pid
 
-        def self.launcher(*args)
-          launcher =  case Platform.os
-                      when :windows
-                        WindowsLauncher.new(*args)
-                      when :macosx
-                        MacOSXLauncher.new(*args)
-                      when :unix, :linux
-                        UnixLauncher.new(*args)
-                      else
-                        raise "unknown OS: #{Platform.os}"
-                      end
-
-          launcher
-        end
-
         def initialize(opts = {})
           @default_profile = opts[:default_profile]
           @secure_ssl = !!opts[:secure_ssl]
@@ -122,10 +107,39 @@ module Selenium
           )
         end
 
-        class WindowsLauncher < Launcher
-          def self.possible_paths
+        class << self
+          def possible_paths
+            case Platform.os
+            when :windows
+              windows_paths
+            when :macosx
+              macosx_paths
+            when :unix, :linux
+              unix_paths
+            else
+              raise "unknown OS: #{Platform.os}"
+            end
+          end
+
+          def unix_paths
+            [
+              Platform.find_binary("google-chrome"),
+              Platform.find_binary("chromium"),
+              Platform.find_binary("chromium-browser"),
+              "/usr/bin/google-chrome"
+            ].compact
+          end
+
+          def macosx_paths
+            [
+             "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+             "#{Platform.home}/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+            ]
+          end
+
+          def windows_paths
             [
-              registry_path,
+              windows_registry_path,
               "#{ENV['USERPROFILE']}\\Local Settings\\Application Data\\Google\\Chrome\\Application\\chrome.exe",
               "#{ENV['USERPROFILE']}\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe",
               "#{Platform.home}\\Local Settings\\Application Data\\Google\\Chrome\\Application\\chrome.exe",
@@ -133,10 +147,12 @@ module Selenium
             ].compact
           end
 
-          def self.registry_path
+          def windows_registry_path
             require "win32/registry"
 
-            reg = Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.exe")
+            reg = Win32::Registry::HKEY_LOCAL_MACHINE.open(
+              "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.exe")
+
             reg[""]
           rescue LoadError
             # older JRuby and IronRuby does not have win32/registry
@@ -144,23 +160,7 @@ module Selenium
           rescue Win32::Registry::Error
             nil
           end
-        end
-
-        class UnixLauncher < Launcher
-          def self.possible_paths
-            [Platform.find_binary("google-chrome"), Platform.find_binary("chromium"), "/usr/bin/google-chrome"].compact
-          end
-
-        end
-
-        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"
-            ]
-          end
-        end
+        end # class << self
 
       end # Launcher
     end # Chrome

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

@@ -34,12 +34,10 @@ module Selenium
       end
 
       def ==(other)
-        return false unless other.kind_of? self.class
-        as_json == other.as_json
+        other.kind_of?(self.class) && as_json == other.as_json
       end
       alias_method :eql?, :==
 
-
       def ftp=(value)
         self.type = :manual
         @ftp = value
@@ -111,7 +109,6 @@ module Selenium
 
           proxy
         end
-
       end # class << self
 
     end # Proxy

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

@@ -37,15 +37,16 @@ module Selenium
         # Initializes the bridge with the given server URL.
         #
         # @param url         [String] url for the remote server
-        # @param http_client [Class] an HTTP client class that implements the same interface as DefaultHttpClient
+        # @param http_client [Object] an HTTP client instance that implements the same protocol as Http::Default
         # @param desired_capabilities [Capabilities] an instance of Remote::Capabilities describing the capabilities you want
         #
 
         def initialize(opts = {})
-          opts                 = default_options.merge(opts)
-          http_client_class    = opts.delete(:http_client)
-          desired_capabilities = opts.delete(:desired_capabilities)
-          url                  = opts.delete(:url)
+          opts = opts.dup
+
+          http_client          = opts.delete(:http_client) { Http::Default.new }
+          desired_capabilities = opts.delete(:desired_capabilities) { Capabilities.firefox }
+          url                  = opts.delete(:url) { "http://localhost:4444/wd/hub" }
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
@@ -62,7 +63,9 @@ module Selenium
           uri = URI.parse(url)
           uri.path += "/" unless uri.path =~ /\/$/
 
-          @http         = http_client_class.new uri
+          http_client.server_url = uri
+
+          @http         = http_client
           @capabilities = create_session(desired_capabilities)
         end
 
@@ -406,14 +409,6 @@ module Selenium
           http.call verb, path, command_hash
         end
 
-        def default_options
-          {
-            :url                  => "http://localhost:4444/wd/hub",
-            :http_client          => Http::Default,
-            :desired_capabilities => Capabilities.firefox
-          }
-        end
-
       end # Bridge
     end # Remote
   end # WebDriver

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

@@ -7,16 +7,17 @@ module Selenium
           CONTENT_TYPE    = "application/json"
           DEFAULT_HEADERS = { "Accept" => CONTENT_TYPE }
 
-          class << self
-            attr_accessor :timeout
+          # deprecated.
+          def self.timeout=(timeout)
+            raise Error::WebDriverError,
+              "Configuration of HTTP timeouts has changed. See http://code.google.com/p/selenium/wiki/RubyBindings for updated intructions."
           end
 
-          def initialize(url)
-            @server_url = url
-          end
+          attr_accessor :timeout
+          attr_writer :server_url
 
           def call(verb, url, command_hash)
-            url      = @server_url.merge(url) unless url.kind_of?(URI)
+            url      = server_url.merge(url) unless url.kind_of?(URI)
             headers  = DEFAULT_HEADERS.dup
 
             if command_hash
@@ -28,6 +29,8 @@ module Selenium
                 puts "   >>> #{payload}"
                 puts "     > #{headers.inspect}"
               end
+            elsif verb == :post
+              headers["Content-Length"] = "0"
             end
 
             request verb, url, headers, payload
@@ -35,6 +38,10 @@ module Selenium
 
           private
 
+          def server_url
+            @server_url or raise Error::WebDriverError, "server_url not set"
+          end
+
           def request(verb, url, headers, payload)
             raise NotImplementedError, "subclass responsibility"
           end

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

@@ -19,7 +19,7 @@ module Selenium
         #   require 'selenium/webdriver/remote/http/curb'
         #   include Selenium
         #
-        #   driver = WebDriver.for :firefox, :http_client => WebDriver::Remote::Http::Curb
+        #   driver = WebDriver.for :firefox, :http_client => WebDriver::Remote::Http::Curb.new
         #
 
         class Curb < Common
@@ -65,7 +65,7 @@ module Selenium
 
               c.max_redirects   = MAX_REDIRECTS
               c.follow_location = true
-              c.timeout         = self.class.timeout if self.class.timeout
+              c.timeout         = @timeout if @timeout
               c.verbose         = !!$DEBUG
 
               c

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

@@ -6,21 +6,21 @@ module Selenium
       module Http
         # @private
         class Default < Common
+          attr_accessor :proxy
 
           private
 
           def http
-            # ignoring SSL for now
             @http ||= (
-              http = Net::HTTP.new @server_url.host, @server_url.port
-              if @server_url.scheme == "https"
+              http = new_http_client
+              if server_url.scheme == "https"
                 http.use_ssl = true
                 http.verify_mode = OpenSSL::SSL::VERIFY_NONE
               end
 
-              if self.class.timeout
-                http.open_timeout = self.class.timeout
-                http.read_timeout = self.class.timeout
+              if @timeout
+                http.open_timeout = @timeout
+                http.read_timeout = @timeout
               end
 
               http
@@ -54,13 +54,27 @@ module Selenium
           def new_request_for(verb, url, headers)
             req = Net::HTTP.const_get(verb.to_s.capitalize).new(url.path, headers)
 
-            if @server_url.userinfo
-              req.basic_auth @server_url.user, @server_url.password
+            if server_url.userinfo
+              req.basic_auth server_url.user, server_url.password
             end
 
             req
           end
 
+          def new_http_client
+            if @proxy
+              unless @proxy.respond_to?(:http) && url = @proxy.http
+                raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}"
+              end
+              proxy = URI.parse(url)
+
+              clazz = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password)
+              clazz.new(server_url.host, server_url.port)
+            else
+              Net::HTTP.new server_url.host, server_url.port
+            end
+          end
+
         end # Default
       end # Http
     end # Remote

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 1
-    - 0
-  version: 0.1.0
+    - 1
+  version: 0.1.1
 platform: ruby
 authors: 
   - Jari Bakken
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +01:00
+date: 2010-11-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency