selenium-webdriver 0.0.24 → 0.0.25

data/{common/src/rb/CHANGES → CHANGES}

@@ -1,3 +1,16 @@
+0.0.25 (2010-07-19)
+===================
+
+* Prevent Firefox from launching in offline mode (issue #587).
+* Add ability to set Firefox' binary path through Selenium::WebDriver::Firefox::Binary.path=
+* Add ability to install Firefox XPIs through Profile#add_extension.
+* Better packaging/building of Firefox/Chrome extensions, which adds rubyzip as a dependency.
+* Remote client supports HTTPS (issue #613 - thanks kkaempf).
+* Fix error message for TimeOutError in the IE driver (issue #602)
+* Add ability to use Chrome's default profile.
+* Fix for frame behaviour in Chrome (issue #273).
+* Standard gem directory structure (issue #475).
+
 0.0.24 (2010-06-17)
 ==================
 

data/{common/src/rb/README → README}

@@ -15,7 +15,7 @@ gem install selenium-webdriver
 
 = LICENSE
 
-Copyright 2009 WebDriver committers
+Copyright 2009-2010 WebDriver committers
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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

@@ -39,6 +39,7 @@ require "selenium/webdriver/error"
 require "selenium/webdriver/platform"
 require "selenium/webdriver/child_process"
 require "selenium/webdriver/file_reaper"
+require "selenium/webdriver/zip_helper"
 require "selenium/webdriver/target_locator"
 require "selenium/webdriver/navigation"
 require "selenium/webdriver/timeouts"
@@ -61,7 +62,7 @@ module Selenium
     autoload :Firefox, 'selenium/webdriver/firefox'
 
     def self.root
-      @root ||= File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", ".."))
+      @root ||= File.expand_path(File.join(File.dirname(__FILE__), ".."))
     end
 
     #

data/{chrome/src/rb/lib → lib}/selenium/webdriver/chrome/bridge.rb

@@ -5,10 +5,10 @@ module Selenium
       # @private
       class Bridge < Remote::Bridge
 
-        def initialize
+        def initialize(opts = {})
           @executor = CommandExecutor.new
 
-          @launcher = Launcher.launcher
+          @launcher = Launcher.launcher(:default_profile => opts[:default_profile])
           @launcher.launch(@executor.uri)
         end
 

data/{chrome/src/rb/lib → lib}/selenium/webdriver/chrome/launcher.rb

@@ -8,14 +8,14 @@ module Selenium
 
         attr_reader :pid
 
-        def self.launcher
+        def self.launcher(*args)
           launcher =  case Platform.os
                       when :windows
-                        WindowsLauncher.new
+                        WindowsLauncher.new(*args)
                       when :macosx
-                        MacOSXLauncher.new
+                        MacOSXLauncher.new(*args)
                       when :unix, :linux
-                        UnixLauncher.new
+                        UnixLauncher.new(*args)
                       else
                         raise "unknown OS: #{Platform.os}"
                       end
@@ -23,6 +23,11 @@ module Selenium
           launcher
         end
 
+        def initialize(opts = {})
+          super()
+          @default_profile = opts[:default_profile]
+        end
+
         def self.binary_path
           @binary_path ||= (
             path = possible_paths.find { |f| File.exist?(f) }
@@ -51,7 +56,6 @@ module Selenium
           cp_r ext_path, tmp_extension_dir
 
           if Platform.win?
-            cp linked_lib_path, tmp_extension_dir
             mv "#{tmp_extension_dir}/manifest-win.json", "#{tmp_extension_dir}/manifest.json"
           else
             mv "#{tmp_extension_dir}/manifest-nonwin.json", "#{tmp_extension_dir}/manifest.json"
@@ -64,19 +68,26 @@ module Selenium
         end
 
         def launch_chrome(server_url)
-          @process = ChildProcess.new Platform.wrap_in_quotes_if_necessary(self.class.binary_path),
-                                      "--load-extension=#{Platform.wrap_in_quotes_if_necessary tmp_extension_dir}",
-                                      "--user-data-dir=#{Platform.wrap_in_quotes_if_necessary tmp_profile_dir}",
-                                      "--activate-on-launch",
-                                      "--disable-hang-monitor",
-                                      "--disable-popup-blocking",
-                                      "--disable-prompt-on-repost",
-                                      server_url
-          @process.start
+          args = [
+            Platform.wrap_in_quotes_if_necessary(self.class.binary_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
+
+          args << server_url
+
+          @process = ChildProcess.new(*args).start
         end
 
         def ext_path
-          @ext_path ||= "#{WebDriver.root}/chrome/src/extension"
+          @ext_path ||= ZipHelper.unzip("#{WebDriver.root}/selenium/webdriver/chrome/extension.zip")
         end
 
         def tmp_extension_dir
@@ -122,11 +133,6 @@ module Selenium
             nil
           end
 
-          def linked_lib_path
-            # TODO: x64
-            @linked_lib_path ||= "#{WebDriver.root}/chrome/prebuilt/Win32/Release/npchromedriver.dll"
-          end
-
           def quit
             # looks like we need a kill right away on Windows + MRI
             @process.kill if Platform.engine == :ruby

data/{common/src/rb/lib → lib}/selenium/webdriver/file_reaper.rb

@@ -8,7 +8,8 @@ module Selenium
         end
 
         def reap?
-          @reap.nil? || @reap
+          @reap = true unless defined?(@reap)
+          !!@reap
         end
 
         def tmp_files

data/{firefox/src/rb/lib → lib}/selenium/webdriver/firefox.rb

@@ -1,5 +1,6 @@
 require "timeout"
 require "socket"
+require "rexml/document"
 
 require "selenium/webdriver/firefox/util"
 require "selenium/webdriver/firefox/binary"
@@ -19,7 +20,7 @@ module Selenium
       DEFAULT_ENABLE_NATIVE_EVENTS    = Platform.os == :windows
       DEFAULT_SECURE_SSL              = false
       DEFAULT_ASSUME_UNTRUSTED_ISSUER = true
-      DEFAULT_LOAD_NO_FOCUS_LIB       = Platform.os == :linux
+      DEFAULT_LOAD_NO_FOCUS_LIB       = false
 
     end
   end

data/{firefox/src/rb/lib → lib}/selenium/webdriver/firefox/binary.rb

@@ -5,9 +5,11 @@ module Selenium
       # @private
       class Binary
 
-        def initialize
-          ENV['MOZ_NO_REMOTE'] = '1' # able to launch multiple instances
-        end
+        NO_FOCUS_LIBRARY_NAME = "x_ignore_nofocus.so"
+        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)
@@ -24,6 +26,12 @@ module Selenium
 
         def start_with(profile, *args)
           ENV['XRE_PROFILE_PATH'] = profile.absolute_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
+          end
+
           execute(*args)
           cope_with_mac_strangeness(args) if Platform.mac?
         end
@@ -67,7 +75,27 @@ module Selenium
 
         private
 
+        def modify_link_library_path(profile)
+          paths = []
+          profile_path = profile.absolute_path
+
+          NO_FOCUS_LIBRARIES.each do |from, to|
+            dest = File.join(profile_path, to)
+            FileUtils.mkdir_p File.dirname(dest)
+            FileUtils.cp from, dest
+
+            paths << File.expand_path(File.dirname(dest))
+          end
+
+          paths += ENV['LD_LIBRARY_PATH'].to_s.split(File::PATH_SEPARATOR)
+
+          ENV['LD_LIBRARY_PATH'] = paths.uniq.join(File::PATH_SEPARATOR)
+          ENV['LD_PRELOAD']      = NO_FOCUS_LIBRARY_NAME
+        end
+
         class << self
+          attr_writer :path
+
           def path
             @path ||= case Platform.os
                       when :macosx
@@ -81,7 +109,7 @@ module Selenium
                       end
 
             unless File.file?(@path)
-              raise Error::WebDriverError, "Could not find Firefox binary. Make sure Firefox is installed (OS: #{Platform.os})"
+              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
 
             @path
@@ -105,9 +133,7 @@ module Selenium
             end
           rescue LoadError
             # older JRuby or IronRuby does not have win32/registry
-            nil
           rescue Win32::Registry::Error
-            raise Error::WebDriverError, "Firefox not found in the Windows registry. Make sure Firefox is installed"
           end
         end # class << self
 

data/{firefox/src/rb/lib → lib}/selenium/webdriver/firefox/profile.rb

@@ -3,37 +3,10 @@ module Selenium
     module Firefox
       class Profile
 
-        ANONYMOUS_PROFILE_NAME = "WEBDRIVER_ANONYMOUS_PROFILE"
-        EXTENSION_NAME         = "fxdriver@googlecode.com"
-        EM_NAMESPACE_URI       = "http://www.mozilla.org/2004/em-rdf#"
-        NO_FOCUS_LIBRARY_NAME  = "libnoblur.so"
-
-        DEFAULT_EXTENSION_SOURCE = File.expand_path("#{WebDriver.root}/firefox/src/extension")
-
-        XPTS = [
-          ["#{WebDriver.root}/firefox/prebuilt/nsINativeEvents.xpt", "components/nsINativeEvents.xpt"],
-          ["#{WebDriver.root}/firefox/prebuilt/nsICommandProcessor.xpt", "components/nsICommandProcessor.xpt"],
-          ["#{WebDriver.root}/firefox/prebuilt/nsIResponseHandler.xpt", "components/nsIResponseHandler.xpt"],
-        ]
-
-        NATIVE_WINDOWS = [
-          "#{WebDriver.root}/firefox/prebuilt/Win32/Release/webdriver-firefox.dll",
-          "platform/WINNT_x86-msvc/components/webdriver-firefox.dll"
-        ]
-
-        NATIVE_LINUX   = [
-          ["#{WebDriver.root}/firefox/prebuilt/linux/Release/libwebdriver-firefox.so", "platform/Linux_x86-gcc3/components/libwebdriver-firefox.so"],
-          ["#{WebDriver.root}/firefox/prebuilt/linux64/Release/libwebdriver-firefox.so", "platform/Linux_x86_64-gcc3/components/libwebdriver-firefox.so"]
-        ]
-
-        NO_FOCUS = [
-          ["#{WebDriver.root}/firefox/prebuilt/amd64/libnoblur64.so", "amd64/#{NO_FOCUS_LIBRARY_NAME}"],
-          ["#{WebDriver.root}/firefox/prebuilt/i386/libnoblur.so", "x86/#{NO_FOCUS_LIBRARY_NAME}"],
-        ]
-
-        SHARED = [
-          ["#{WebDriver.root}/common/src/js/extension/dommessenger.js", "content/dommessenger.js"]
-        ]
+        ANONYMOUS_PROFILE_NAME   = "WEBDRIVER_ANONYMOUS_PROFILE"
+        EXTENSION_NAME           = "fxdriver@googlecode.com"
+        EM_NAMESPACE_URI         = "http://www.mozilla.org/2004/em-rdf#"
+        WEBDRIVER_EXTENSION_PATH = File.expand_path("#{WebDriver.root}/selenium/webdriver/firefox/extension/webdriver.xpi")
 
         attr_reader :name, :directory
         attr_writer :secure_ssl, :native_events, :load_no_focus_lib
@@ -72,7 +45,6 @@ module Selenium
 
           # TODO: replace constants with options hash
           @port              = DEFAULT_PORT
-          @extension_source  = DEFAULT_EXTENSION_SOURCE
           @native_events     = DEFAULT_ENABLE_NATIVE_EVENTS
           @secure_ssl        = DEFAULT_SECURE_SSL
           @untrusted_issuer  = DEFAULT_ASSUME_UNTRUSTED_ISSUER
@@ -132,44 +104,40 @@ module Selenium
         def add_webdriver_extension(force_creation = false)
           ext_path = File.join(extensions_dir, EXTENSION_NAME)
 
-          if File.exists?(ext_path)
+          if File.exists? ext_path
             return unless force_creation
           end
 
-          FileUtils.rm_rf ext_path
-          FileUtils.mkdir_p File.dirname(ext_path), :mode => 0700
-          FileUtils.cp_r @extension_source, ext_path
-
-          from_to = XPTS + SHARED
-
-          if native_events?
-            case Platform.os
-            when :linux
-              NATIVE_LINUX.each do |lib|
-                from_to << lib
-              end
-            when :windows
-              from_to << NATIVE_WINDOWS
-            else
-              raise Error::WebDriverError, "can't enable native events on #{Platform.os.inspect}"
-            end
-          end
+          add_extension WEBDRIVER_EXTENSION_PATH
+          delete_extensions_cache
+        end
 
-          if load_no_focus_lib?
-            from_to += NO_FOCUS
-            modify_link_library_path(NO_FOCUS.map { |source, dest| File.join(ext_path, File.dirname(dest)) })
+        #
+        # Aadd the extension (directory, .zip or .xpi) at the given path to the profile.
+        #
+
+        def add_extension(path)
+          unless File.exist?(path)
+            raise Error::WebDriverError, "could not find extension at #{path.inspect}"
           end
 
-          from_to.each do |source, destination|
-            dest = File.join(ext_path, destination)
-            FileUtils.mkdir_p File.dirname(dest)
-            FileUtils.cp source, dest
+          if File.directory? path
+            root = path
+          else
+            unless %w[.zip .xpi].include? File.extname(path)
+              raise Error::WebDriverError, "expected .zip or .xpi extension, got #{path.inspect}"
+            end
+
+            root = ZipHelper.unzip(path)
           end
 
-          delete_extensions_cache
-        end
+          id       = read_id_from_install_rdf(root)
+          ext_path = File.join(extensions_dir, id)
 
-        # TODO: add_extension
+          FileUtils.rm_rf ext_path
+          FileUtils.mkdir_p File.dirname(ext_path), :mode => 0700
+          FileUtils.cp_r root, ext_path
+        end
 
         def extensions_dir
           @extensions_dir ||= File.join(directory, "extensions")
@@ -184,17 +152,6 @@ module Selenium
           FileUtils.rm_f cache if File.exist?(cache)
         end
 
-        def modify_link_library_path(paths)
-          old_path = ENV['LD_LIBRARY_PATH']
-
-          unless [nil, ''].include?(old_path)
-            paths << old_path
-          end
-
-          ENV['LD_LIBRARY_PATH'] = paths.join(File::PATH_SEPARATOR)
-          ENV['LD_PRELOAD']      = NO_FOCUS_LIBRARY_NAME
-        end
-
         def native_events?
           @native_events == true
         end
@@ -217,6 +174,13 @@ module Selenium
 
         private
 
+        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
+
         def create_tmp_copy(directory)
           tmp_directory = Dir.mktmpdir("webdriver-rb-profilecopy")
 
@@ -274,6 +238,7 @@ module Selenium
           "dom.disable_open_during_load"              => 'false',
           "extensions.update.enabled"                 => 'false',
           "extensions.update.notifyUser"              => 'false',
+          "network.manage-offline-status"             => 'false',
           "security.warn_entering_secure"             => 'false',
           "security.warn_submit_insecure"             => 'false',
           "security.warn_entering_secure.show_once"   => 'false',

data/{jobbie/src/rb/lib → lib}/selenium/webdriver/ie.rb

@@ -4,8 +4,8 @@ module Selenium
     # @private
     module IE
       DLLS = {
-        :win32 => "#{WebDriver.root}/jobbie/prebuilt/Win32/Release/InternetExplorerDriver.dll",
-        :x64   => "#{WebDriver.root}/jobbie/prebuilt/x64/Release/InternetExplorerDriver.dll"
+        :win32 => "#{WebDriver.root}/selenium/webdriver/ie/native/win32/InternetExplorerDriver.dll",
+        :x64   => "#{WebDriver.root}/selenium/webdriver/ie/native/x64/InternetExplorerDriver.dll"
       }
     end
   end