selenium-webdriver 0.1.4 → 0.2.0.dev

data/CHANGES

@@ -1,5 +1,12 @@
+0.2.0 (???)
+==================
+
+* Update Ruby bindings to use the new Chrome driver (http://code.google.com/p/selenium/wiki/ChromeDriver).
+* Add deprecation warning for WebDriver::Element#value.
+* Change the default timeout for Wait instances to 5 seconds.
+
 0.1.4 (2011-03-21)
-===========
+==================
 
 * Support for Firefox 4.
 * Search PATH for Firefox / Chrome on OS X as well.

data/lib/selenium/webdriver/chrome.rb

@@ -1,17 +1,15 @@
-require "selenium/webdriver/chrome/launcher"
-require "selenium/webdriver/chrome/command_executor"
+require 'net/http'
+
+require "selenium/webdriver/chrome/service"
 require "selenium/webdriver/chrome/bridge"
 
-require "fileutils"
-require "thread"
-require "socket"
 
 module Selenium
   module WebDriver
 
     module Chrome
       def self.path=(path)
-        Launcher.binary_path = path
+        Service.executable_path = path
       end
     end
 

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

@@ -6,13 +6,24 @@ module Selenium
       class Bridge < Remote::Bridge
 
         def initialize(opts = {})
-          @launcher = Launcher.new(
-            :default_profile => opts[:default_profile],
-            :secure_ssl      => opts[:secure_ssl]
-          )
+          # TODO: pass options to Chrome::Service
+          http_client = opts.delete(:http_client)
 
-          @executor = CommandExecutor.new
-          @launcher.launch(@executor.uri)
+          unless opts.empty?
+            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
+          end
+
+          @service = Service.default_service
+          @service.start
+
+          remote_opts = {
+            :url                  => @service.uri,
+            :desired_capabilities => :chrome
+          }
+
+          remote_opts.merge!(:http_client => http_client) if http_client
+
+          super(remote_opts)
         end
 
         def browser
@@ -20,7 +31,7 @@ module Selenium
         end
 
         def driver_extensions
-          [DriverExtensions::TakesScreenshot]
+          []
         end
 
         def capabilities
@@ -28,81 +39,9 @@ module Selenium
         end
 
         def quit
-          begin
-            super
-          rescue IOError
-          end
-
-          @executor.close
-          @launcher.quit
-        end
-
-        def getAllCookies
-          execute :getCookies
-        end
-
-        def deleteCookie(name)
-          execute :deleteCookie, :name => name
-        end
-
-        def setImplicitWaitTimeout(milliseconds)
-          execute :implicitlyWait, :ms => milliseconds
-        end
-
-        def elementEquals(element, other)
-          element.ref == other.ref
-        end
-
-        %w[acceptAlert dismissAlert setAlertValue getAlertText].each do |m|
-          define_method(m) { |*args| raise NotImplementedError }
-        end
-
-        private
-
-        def execute(command_name, opts = {}, args = nil)
-          command = {:request => command_name}.merge(opts)
-          command.merge!(args) if args
-
-          command = camel_case_keys_in(command)
-
-          puts "--> #{command.inspect}" if $DEBUG
-          resp = raw_execute command
-          puts "<-- #{resp.inspect}" if $DEBUG
-
-          code = resp['status']
-          if e = Error.for_code(code)
-            msg = resp['value']['message'] if resp['value']
-            msg ||= "unknown exception for #{command.inspect}"
-            msg << " (#{code})"
-
-            raise e, msg
-          end
-
-          resp['value']
-        end
-
-        def raw_execute(command)
-          @executor.execute command
-        end
-
-        #
-        # TODO(jari): fix this in the remote driver
-        #
-
-        def camel_case(string)
-          parts = string.split('_')
-          parts[1..-1].map { |e| e.capitalize! }
-          parts.join
-        end
-
-        def camel_case_keys_in(hash)
-          h = {}
-
-          hash.each do |key, value|
-            h[camel_case(key.to_s)] = value
-          end
-
-          h
+          super
+        ensure
+          @service.stop
         end
 
       end # Bridge

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

@@ -0,0 +1,62 @@
+module Selenium
+  module WebDriver
+    module Chrome
+
+      #
+      # @api private
+      #
+
+      class Service
+        START_TIMEOUT = 20
+        STOP_TIMEOUT  = 5
+        MISSING_TEXT  = "Unable to find the chromedriver executable. Please download the server from http://code.google.com/p/selenium/downloads/list and place it somewhere on your PATH. More info at http://code.google.com/p/selenium/wiki/ChromeDriver."
+
+        attr_reader :uri
+
+        def self.executable_path
+          @executable_path ||= (
+            Platform.find_binary "chromedriver" or raise Error::WebDriverError, MISSING_TEXT
+          )
+        end
+
+        def self.executable_path=(path)
+          Platform.assert_executable path
+          @executable_path = path
+        end
+
+        def self.default_service
+          new executable_path, PortProber.random
+        end
+
+        def initialize(executable_path, port)
+          @uri           = URI.parse "http://#{Platform.localhost}:#{port}"
+          server_command = [executable_path, "--port=#{port}"]
+
+          @process       = ChildProcess.build(*server_command)
+          @socket_poller = SocketPoller.new Platform.localhost, port, START_TIMEOUT
+
+          @process.io.inherit! if $DEBUG == true
+        end
+
+        def start
+          @process.start
+
+          unless @socket_poller.connected?
+            raise Error::WebDriverError, "unable to connect to chromedriver #{@uri}"
+          end
+        end
+
+        def stop
+          return if @process.nil? || @process.exited?
+
+          Net::HTTP.get uri.host, '/shutdown', uri.port
+          @process.poll_for_exit STOP_TIMEOUT
+        rescue ChildProcess::TimeoutError
+          # ok, force quit
+          @process.stop STOP_TIMEOUT
+        end
+      end # Service
+
+    end # Chrome
+  end # WebDriver
+end # Service

data/lib/selenium/webdriver/common.rb

@@ -5,6 +5,7 @@ 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"

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

@@ -53,6 +53,7 @@ module Selenium
       #
 
       def value
+        warn "#{self.class}#value is deprecated, please use #{self.class}#attribute('value')"
         bridge.getElementValue @id
       end
 

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

@@ -0,0 +1,25 @@
+module Selenium
+  module WebDriver
+    class PortProber
+      def self.above(port)
+        port += 1 until free? port
+        port
+      end
+      
+      def self.random
+        server = TCPServer.new(Platform.localhost, 0)
+        port   = server.addr[1]
+        server.close
+        
+        port
+      end
+      
+      def self.free?(port)
+        TCPServer.new(Platform.localhost, port).close
+        true
+      rescue SocketError, Errno::EADDRINUSE
+        false
+      end
+    end # PortProber
+  end # WebDriver
+end # Selenium

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

@@ -2,14 +2,14 @@ module Selenium
   module WebDriver
     class Wait
 
-      DEFAULT_TIMEOUT  = 30
+      DEFAULT_TIMEOUT  = 5
       DEFAULT_INTERVAL = 0.5
 
       #
       # Create a new Wait instance
       #
       # @param [Hash] opts Options for this instance
-      # @option opts [Numeric] :timeout (30) Seconds to wait before timing out.
+      # @option opts [Numeric] :timeout (5) Seconds to wait before timing out.
       # @option opts [Numeric] :interval (0.5) Seconds to sleep between polls.
       # @option opts [String] :message Exception mesage if timed out.
 

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

@@ -11,7 +11,8 @@ module Selenium
           ["#{WebDriver.root}/selenium/webdriver/firefox/native/linux/x86/#{NO_FOCUS_LIBRARY_NAME}", "x86/#{NO_FOCUS_LIBRARY_NAME}"],
         ]
 
-        WAIT_TIMEOUT          = 90
+        WAIT_TIMEOUT = 90
+        QUIT_TIMEOUT = 5
 
         def start_with(profile, profile_path, *args)
           profile_path = profile_path.gsub("/", "\\") if Platform.win?
@@ -32,10 +33,10 @@ module Selenium
 
         def quit
           return unless @process
-          @process.poll_for_exit 5
+          @process.poll_for_exit QUIT_TIMEOUT
         rescue ChildProcess::TimeoutError
           # ok, force quit
-          @process.stop 5
+          @process.stop QUIT_TIMEOUT
         end
 
         def wait

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

@@ -46,13 +46,7 @@ module Selenium
         end
 
         def find_free_port
-          port = @port
-
-          until free_port?(port)
-            port += 1
-          end
-
-          @port = port
+          @port = PortProber.above @port
         end
 
         def create_profile
@@ -82,14 +76,6 @@ module Selenium
           end
         end
 
-        def free_port?(port)
-          s = TCPServer.new(@host, port)
-          s.close
-          true
-        rescue SocketError, Errno::EADDRINUSE
-          false
-        end
-
         def fetch_profile
           if @profile_name
             @profile = Profile.from_name @profile_name

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

@@ -59,7 +59,7 @@ module Selenium
             desired_capabilities = Capabilities.send(desired_capabilities)
           end
 
-          uri = URI.parse(url)
+          uri = url.kind_of?(URI) ? url : URI.parse(url)
           uri.path += "/" unless uri.path =~ /\/$/
 
           http_client.server_url = uri

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.4
+  prerelease: 6
+  version: 0.2.0.dev
 platform: ruby
 authors: 
 - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +01:00
+date: 2011-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,9 +116,7 @@ files:
 - lib/selenium/webdriver/android/bridge.rb
 - lib/selenium/webdriver/android.rb
 - lib/selenium/webdriver/chrome/bridge.rb
-- lib/selenium/webdriver/chrome/command_executor.rb
-- lib/selenium/webdriver/chrome/extension.zip
-- lib/selenium/webdriver/chrome/launcher.rb
+- lib/selenium/webdriver/chrome/service.rb
 - lib/selenium/webdriver/chrome.rb
 - lib/selenium/webdriver/common/action_builder.rb
 - lib/selenium/webdriver/common/alert.rb
@@ -138,6 +136,7 @@ files:
 - lib/selenium/webdriver/common/navigation.rb
 - lib/selenium/webdriver/common/options.rb
 - lib/selenium/webdriver/common/platform.rb
+- lib/selenium/webdriver/common/port_prober.rb
 - lib/selenium/webdriver/common/proxy.rb
 - lib/selenium/webdriver/common/search_context.rb
 - lib/selenium/webdriver/common/socket_poller.rb
@@ -198,9 +197,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

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

@@ -1,126 +0,0 @@
-module Selenium
-  module WebDriver
-    module Chrome
-
-      # @api private
-      class CommandExecutor
-        HTML_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n%s"
-        JSON_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: application/json; charset=UTF-8\r\n\r\n%s"
-
-        def initialize
-          @server       = TCPServer.new(localhost, 0)
-          @queue        = Queue.new
-
-          @accepted_any = false
-          @next_socket  = nil
-          @listening    = true
-
-          Thread.new { start_run_loop }
-        end
-
-        def execute(command)
-          until accepted_any?
-            Thread.pass
-            sleep 0.01
-          end
-
-          json = command.to_json
-          data = JSON_TEMPLATE % [json.length, json]
-
-          @next_socket.write data
-          @next_socket.close
-
-          JSON.parse read_response(@queue.pop)
-        end
-
-        def close
-          stop_listening
-          close_sockets
-          @server.close unless @server.closed?
-        rescue IOError
-          nil
-        end
-
-        def port
-          @server.addr[1]
-        end
-
-        def uri
-          "http://#{Platform.localhost}:#{port}/chromeCommandExecutor"
-        end
-
-        private
-
-        def localhost
-          Platform.ironruby? ? Platform.localhost : "0.0.0.0" # yeah, weird..
-        end
-
-        def start_run_loop
-          while(@listening) do
-            socket = @server.accept
-
-            if socket.read(1) == "G" # initial GET(s)
-              write_holding_page_to socket
-            else
-              if accepted_any?
-                @queue << socket
-              else
-                read_response(socket)
-                @accepted_any = true
-              end
-            end
-          end
-        rescue IOError, Errno::EBADF
-          raise if @listening
-        end
-
-        def read_response(socket)
-          result = ''
-          seen_double_crlf = false
-
-          while line = next_line(socket)
-            seen_double_crlf = true if line.empty?
-            result << "#{line}\n" if seen_double_crlf
-          end
-
-          @next_socket = socket
-
-          result.strip!
-        end
-
-        def accepted_any?
-          @accepted_any
-        end
-
-        def close_sockets
-          @next_socket.close if @next_socket
-          @queue.pop.close until @queue.empty?
-        end
-
-        def stop_listening
-          @listening = false
-        end
-
-        def next_line(socket)
-          return if socket.closed?
-          input = socket.gets
-
-          raise Error::WebDriverError, "unexpected EOF from Chrome" if input.nil?
-
-          line = input.chomp
-          return if line == "EOResponse"
-
-          line
-        end
-
-        def write_holding_page_to(socket)
-          msg = %[<html><head><script type='text/javascript'>if (window.location.search == '') { setTimeout("window.location = window.location.href + '?reloaded'", 5000); }</script></head><body><p>ChromeDriver server started and connected.  Please leave this tab open.</p></body></html>]
-
-          socket.write HTML_TEMPLATE % [msg.length, msg]
-          socket.close
-        end
-
-      end # CommandExecutor
-    end # Chrome
-  end # WebDriver
-end # Selenium

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

@@ -1,175 +0,0 @@
-module Selenium
-  module WebDriver
-    module Chrome
-
-      # @api private
-      class Launcher
-        include FileUtils
-
-        attr_reader :pid
-
-        def initialize(opts = {})
-          @default_profile = opts[:default_profile]
-          @secure_ssl = !!opts[:secure_ssl]
-        end
-
-        def self.binary_path
-          @binary_path ||= (
-            path = possible_paths.find { |f| File.exist?(f) }
-            path || raise(Error::WebDriverError, "Could not find Chrome binary. Make sure Chrome is installed (OS: #{Platform.os})")
-          )
-        end
-
-        #
-        # @api private
-        #
-        # @see Chrome.path=
-        #
-
-        def self.binary_path=(path)
-          Platform.assert_executable(path)
-          @binary_path = path
-        end
-
-        def launch(server_url)
-          create_extension
-          create_profile
-          launch_chrome server_url
-
-          pid
-        end
-
-        def quit
-          @process.stop
-        end
-
-        private
-
-        def create_extension
-          # TODO: find a better way to do this
-          rm_rf tmp_extension_dir
-          mkdir_p File.dirname(tmp_extension_dir), :mode => 0700
-          cp_r ext_path, tmp_extension_dir
-        end
-
-        def create_profile
-          touch "#{tmp_profile_dir}/First Run"
-          touch "#{tmp_profile_dir}/First Run Dev"
-        end
-
-        def launch_chrome(server_url)
-          path = self.class.binary_path
-
-          args = [
-            Platform.wrap_in_quotes_if_necessary(path),
-            "--load-extension=#{Platform.wrap_in_quotes_if_necessary(tmp_extension_dir)}",
-            "--activate-on-launch",
-            "--disable-hang-monitor",
-            "--disable-popup-blocking",
-            "--disable-prompt-on-repost"
-          ]
-
-          unless @default_profile
-            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.build(*args)
-          @process.io.inherit! if $DEBUG
-
-          @process.start
-        end
-
-        def ext_path
-          @ext_path ||= Zipper.unzip("#{WebDriver.root}/selenium/webdriver/chrome/extension.zip")
-        end
-
-        def tmp_extension_dir
-          @tmp_extension_dir ||= (
-            dir = Dir.mktmpdir("webdriver-chrome-extension")
-            Platform.make_writable(dir)
-            FileReaper << dir
-
-            dir
-          )
-        end
-
-        def tmp_profile_dir
-          @tmp_profile_dir ||= (
-            dir = Dir.mktmpdir("webdriver-chrome-profile")
-            Platform.make_writable(dir)
-            FileReaper << dir
-
-            dir
-          )
-        end
-
-        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",
-             Platform.find_binary("Google Chrome")
-            ]
-          end
-
-          def windows_paths
-            paths = [
-              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",
-              "#{Platform.home}\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe",
-            ].compact
-
-            paths.map! { |path| Platform.cygwin_path(path) } if Platform.cygwin?
-
-            paths
-          end
-
-          def windows_registry_path
-            require "win32/registry"
-
-            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
-            nil
-          rescue Win32::Registry::Error
-            nil
-          end
-        end # class << self
-
-      end # Launcher
-    end # Chrome
-  end # WebDriver
-end # Selenium