selenium-webdriver 0.0.28 → 0.0.29

data/lib/selenium/webdriver/{platform.rb → common/platform.rb}

@@ -91,6 +91,16 @@ module Selenium
         File.chmod 0766, file
       end
 
+      def assert_executable(path)
+        unless File.file? path
+          raise Error::WebDriverError, "not a file: #{path.inspect}"
+        end
+
+        unless File.executable? path
+          raise Error::WebDriverError, "not executable: #{path.inspect}"
+        end
+      end
+
       def find_binary(*binary_names)
         paths = ENV['PATH'].split(File::PATH_SEPARATOR)
         binary_names.map! { |n| "#{n}.exe" } if win?

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

@@ -0,0 +1,47 @@
+require "socket"
+
+module Selenium
+  module WebDriver
+    class SocketPoller
+
+      def initialize(host, port, timeout = 0, interval = 0.25)
+        @host     = host
+        @port     = Integer(port)
+        @timeout  = Integer(timeout)
+        @interval = interval
+      end
+
+      #
+      # @return true if the socket can be connected to
+      #
+
+      def success?
+        max_time = Time.now + @timeout
+
+        (
+          return true if can_connect?
+          wait
+        ) until Time.now >= max_time
+
+        false
+      end
+
+      private
+
+      def can_connect?
+        # 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 Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError => e
+        $stderr.puts [@host, @port].inspect if $DEBUG
+        false
+      end
+
+      def wait
+        sleep @interval
+      end
+
+    end # SocketPoller
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/{target_locator.rb → common/target_locator.rb}

@@ -6,8 +6,8 @@ module Selenium
       # @api private
       #
 
-      def initialize(driver)
-        @bridge = driver.bridge
+      def initialize(bridge)
+        @bridge = bridge
       end
 
       #
@@ -33,15 +33,18 @@ module Selenium
           original = @bridge.getCurrentWindowHandle
           @bridge.switchToWindow id
 
-          yield
+          begin
+            returned = yield
+          ensure
+            current_handles = @bridge.getWindowHandles
 
-          current_handles = @bridge.getWindowHandles
+            if current_handles.size == 1
+              original = current_handles.shift
+            end
 
-          if current_handles.size == 1
-            original = current_handles.shift
+            @bridge.switchToWindow original
+            returned
           end
-
-          @bridge.switchToWindow original
         else
           @bridge.switchToWindow id
         end

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

@@ -0,0 +1,60 @@
+module Selenium
+  module WebDriver
+    class Wait
+
+      DEFAULT_TIMEOUT  = 30
+      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] :interval (0.5) Seconds to sleep between polls.
+      # @option opts [String] :message Exception mesage if timed out.
+
+      def initialize(opts = {})
+        @timeout  = opts.fetch(:timeout, DEFAULT_TIMEOUT)
+        @interval = opts.fetch(:interval, DEFAULT_INTERVAL)
+        @message  = opts[:message]
+      end
+
+
+      #
+      # Wait until the given block returns a true value.
+      #
+      # @raise [Error::TimeOutError]
+      # @return [Object] the result of the block
+      #
+
+      def until(&blk)
+        end_time = Time.now + @timeout
+        last_error = nil
+
+        until Time.now > end_time
+          begin
+            result = yield
+            return result if result
+          rescue Error::NoSuchElementError => last_error
+            # swallowed
+          end
+
+          sleep @interval
+        end
+
+
+        if @message
+          msg = @message.dup
+        else
+          msg = "timed out after #{@timeout} seconds"
+        end
+
+        msg << " (#{last_error.message})}" if last_error
+
+        raise Error::TimeOutError, msg
+      end
+
+    end # Wait
+  end # WebDriver
+end # Selenium
+

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

@@ -0,0 +1,54 @@
+require 'zip/zip'
+require 'tempfile'
+require 'find'
+
+module Selenium
+  module WebDriver
+    module Zipper
+
+      EXTENSIONS = %w[.zip .xpi]
+
+      def self.unzip(path)
+        destination = Dir.mktmpdir("unzip")
+        FileReaper << destination
+
+        Zip::ZipFile.open(path) do |zip|
+          zip.each do |entry|
+            to      = File.join(destination, entry.name)
+            dirname = File.dirname(to)
+
+            FileUtils.mkdir_p dirname unless File.exist? dirname
+            zip.extract(entry, to)
+          end
+        end
+
+        destination
+      end
+
+      def self.zip(path)
+        tmp_zip = Tempfile.new("webdriver-zip")
+
+        begin
+          zos = Zip::ZipOutputStream.new(tmp_zip.path)
+
+          ::Find.find(path) do |file|
+            next if File.directory?(file)
+            entry = file.sub("#{path}/", '')
+
+            zos.put_next_entry(entry)
+            zos << File.read(file)
+            p :added => file, :as => entry
+          end
+
+          zos.close
+          tmp_zip.rewind
+
+          [tmp_zip.read].pack("m")
+        ensure
+          tmp_zip.close
+        end
+      end
+
+    end # Zipper
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/firefox.rb

@@ -3,6 +3,8 @@ 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"
@@ -11,17 +13,18 @@ require "selenium/webdriver/firefox/bridge"
 
 module Selenium
   module WebDriver
-
-    # @private
     module Firefox
 
-      DEFAULT_PROFILE_NAME            = "WebDriver".freeze
       DEFAULT_PORT                    = 7055
       DEFAULT_ENABLE_NATIVE_EVENTS    = Platform.os == :windows
       DEFAULT_SECURE_SSL              = false
       DEFAULT_ASSUME_UNTRUSTED_ISSUER = true
       DEFAULT_LOAD_NO_FOCUS_LIB       = false
 
+      def self.path=(path)
+        Binary.path = path
+      end
+
     end
   end
 end

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

@@ -6,78 +6,66 @@ module Selenium
       class Binary
 
         NO_FOCUS_LIBRARY_NAME = "x_ignore_nofocus.so"
-        NO_FOCUS_LIBRARIES = [
+        NO_FOCUS_LIBRARIES    = [
           ["#{WebDriver.root}/selenium/webdriver/firefox/native/linux/amd64/#{NO_FOCUS_LIBRARY_NAME}", "amd64/#{NO_FOCUS_LIBRARY_NAME}"],
           ["#{WebDriver.root}/selenium/webdriver/firefox/native/linux/x86/#{NO_FOCUS_LIBRARY_NAME}", "x86/#{NO_FOCUS_LIBRARY_NAME}"],
         ]
 
-        def create_base_profile(name)
-          execute("-CreateProfile", name)
+        WAIT_TIMEOUT          = 90
 
-          status = nil
-          Timeout.timeout(15, Error::TimeOutError) do
-            _, status = wait
-          end
-
-          if status && status.to_i != 0
-            raise Error::WebDriverError, "could not create base profile: (exit status: #{status})"
-          end
-        end
+        def start_with(profile, profile_path, *args)
+          profile_path = profile_path.gsub("/", "\\") if Platform.win?
 
-        def start_with(profile, *args)
-          ENV['XRE_PROFILE_PATH'] = profile.absolute_path
+          ENV['XRE_PROFILE_PATH'] = profile_path
           ENV['MOZ_NO_REMOTE'] = '1' # able to launch multiple instances
 
           if Platform.linux? && (profile.native_events? || profile.load_no_focus_lib?)
-            modify_link_library_path profile
+            modify_link_library_path profile_path
           end
 
+          ENV['XRE_CONSOLE_LOG'] = profile.log_file if profile.log_file
+
           execute(*args)
           cope_with_mac_strangeness(args) if Platform.mac?
         end
 
+        def quit
+          return unless @process
+          @process.poll_for_exit 5
+        rescue ChildProcess::TimeoutError
+          # ok, force quit
+          @process.stop 5
+        end
+
+        def wait
+          @process.poll_for_exit(WAIT_TIMEOUT) if @process
+        end
+
+        private
+
         def execute(*extra_args)
           args = [self.class.path, "-no-remote", "--verbose"] + extra_args
-          @process = ChildProcess.new(*args).start
+          @process = ChildProcess.build(*args).start
         end
 
         def cope_with_mac_strangeness(args)
           sleep 0.3
 
-          if @process.ugly_death?
-            # process crashed, trying a restart. sleeping 5 seconds shorter than the java driver
-            sleep 5
+          if @process.crashed?
+            # ok, trying a restart
+            sleep 7
             execute(*args)
           end
 
           # ensure we're ok
           sleep 0.3
-          if @process.ugly_death?
+          if @process.crashed?
             raise Error::WebDriverError, "unable to start Firefox cleanly, args: #{args.inspect}"
           end
         end
 
-        def quit
-          @process.ensure_death if @process
-        end
-
-        def kill
-          @process.kill if @process
-        end
-
-        def wait
-          @process.wait if @process
-        end
-
-        def pid
-          @process.pid if @process
-        end
-
-        private
-
-        def modify_link_library_path(profile)
+        def modify_link_library_path(profile_path)
           paths = []
-          profile_path = profile.absolute_path
 
           NO_FOCUS_LIBRARIES.each do |from, to|
             dest = File.join(profile_path, to)
@@ -94,7 +82,17 @@ module Selenium
         end
 
         class << self
-          attr_writer :path
+
+          #
+          # @private
+          #
+          # @see Firefox.path=
+          #
+
+          def path=(path)
+            Platform.assert_executable(path)
+            @path = path
+          end
 
           def path
             @path ||= case Platform.os
@@ -108,7 +106,7 @@ module Selenium
                         raise Error::WebDriverError, "unknown platform: #{Platform.os}"
                       end
 
-            unless File.file?(@path)
+            unless File.file?(@path.to_s)
               raise Error::WebDriverError, "Could not find Firefox binary (os=#{Platform.os}). Make sure Firefox is installed or set the path manually with #{self}.path="
             end
 
@@ -118,7 +116,7 @@ module Selenium
           private
 
           def windows_path
-            windows_registry_path || "#{ ENV['PROGRAMFILES'] || "\\Program Files" }\\Mozilla Firefox\\firefox.exe"
+            windows_registry_path || likely_windows_path || Platform.find_binary("firefox")
           end
 
           def windows_registry_path
@@ -135,6 +133,11 @@ module Selenium
             # older JRuby or IronRuby does not have win32/registry
           rescue Win32::Registry::Error
           end
+
+          def likely_windows_path
+            path = "#{ ENV['PROGRAMFILES'] || "\\Program Files" }\\Mozilla Firefox\\firefox.exe"
+            path if File.executable?(path)
+          end
         end # class << self
 
       end # Binary

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

@@ -9,8 +9,8 @@ module Selenium
           @binary     = Binary.new
           @launcher   = Launcher.new(
             @binary,
-            opts.delete(:port)    || DEFAULT_PORT,
-            opts.delete(:profile) || DEFAULT_PROFILE_NAME
+            opts.delete(:port) || DEFAULT_PORT,
+            opts.delete(:profile)
           )
 
           http_client = opts.delete(:http_client)
@@ -50,14 +50,6 @@ module Selenium
           execute :screenshot
         end
 
-        def findElementByCssSelector(parent, selector)
-          find_element_by 'css selector', selector, parent
-        end
-
-        def findElementsByCssSelector(parent, selector)
-          find_elements_by 'css selector', selector, parent
-        end
-
       end # Bridge
     end # Firefox
   end # WebDriver

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

@@ -0,0 +1,51 @@
+module Selenium
+  module WebDriver
+    module Firefox
+
+      # @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}"
+          end
+
+          @path = path
+        end
+
+        def write_to(extensions_dir)
+          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
+          FileUtils.cp_r root, ext_path
+        end
+
+        private
+
+        def root
+          @root ||= (
+            if File.directory? @path
+              @path
+            else
+              unless Zipper::EXTENSIONS.include? File.extname(@path)
+                raise Error::WebDriverError, "expected #{Zipper::EXTENSIONS.join(" or ")}, got #{@path.inspect}"
+              end
+
+              Zipper.unzip(@path)
+            end
+          )
+        end
+
+        def read_id_from_install_rdf(directory)
+          rdf_path = File.join(directory, "install.rdf")
+          doc = REXML::Document.new(File.read(rdf_path))
+
+          REXML::XPath.first(doc, "//em:id").text
+        end
+
+      end # Extension
+    end # Firefox
+  end # WebDriver
+end # Selenium