selenium-webdriver 0.0.29 → 0.1.0

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

@@ -75,7 +75,7 @@ module Selenium
         def launch_chrome(server_url)
           args = [
             Platform.wrap_in_quotes_if_necessary(self.class.binary_path),
-            "--load-extension=#{Platform.wrap_in_quotes_if_necessary tmp_extension_dir}",
+            "--load-extension=#{Platform.wrap_in_quotes_if_necessary(tmp_extension_dir)}",
             "--activate-on-launch",
             "--disable-hang-monitor",
             "--disable-popup-blocking",
@@ -83,7 +83,7 @@ module Selenium
           ]
 
           unless @default_profile
-            args << "--user-data-dir=#{Platform.wrap_in_quotes_if_necessary tmp_profile_dir}"
+            args << "--user-data-dir=#{Platform.wrap_in_quotes_if_necessary(tmp_profile_dir)}"
           end
 
           unless @secure_ssl
@@ -92,7 +92,10 @@ module Selenium
 
           args << server_url
 
-          @process = ChildProcess.build(*args).start
+          @process = ChildProcess.build(*args)
+          @process.io.inherit! if $DEBUG
+
+          @process.start
         end
 
         def ext_path

data/lib/selenium/webdriver/common.rb

@@ -2,6 +2,7 @@ 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/zipper"
@@ -12,6 +13,7 @@ require "selenium/webdriver/common/timeouts"
 require "selenium/webdriver/common/options"
 require "selenium/webdriver/common/find"
 require "selenium/webdriver/common/driver_extensions/takes_screenshot"
+require "selenium/webdriver/common/driver_extensions/rotatable"
 require "selenium/webdriver/common/keys"
 require "selenium/webdriver/common/bridge_helper"
 require "selenium/webdriver/common/driver"

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

@@ -34,14 +34,18 @@ module Selenium
 
         def for(browser, *args)
           bridge = case browser
-                   when :ie, :internet_explorer
-                     IE::Bridge.new(*args)
+                   when :firefox, :ff
+                     Firefox::Bridge.new(*args)
                    when :remote
                      Remote::Bridge.new(*args)
+                   when :ie, :internet_explorer
+                     IE::Bridge.new(*args)
                    when :chrome
                      Chrome::Bridge.new(*args)
-                   when :firefox, :ff
-                     Firefox::Bridge.new(*args)
+                   when :android
+                     Android::Bridge.new(*args)
+                   when :iphone
+                     IPhone::Bridge.new(*args)
                    else
                      raise ArgumentError, "unknown driver: #{browser.inspect}"
                    end

data/lib/selenium/webdriver/common/driver_extensions/rotatable.rb

@@ -0,0 +1,28 @@
+module Selenium
+  module WebDriver
+
+    #
+    # @private
+    #
+
+    module DriverExtensions
+      module Rotatable
+
+        ORIENTATIONS = [:landscape, :portrait]
+
+        def rotate(orientation)
+          unless ORIENTATIONS.include?(orientation)
+            raise ArgumentError, "expected #{ORIENTATIONS.inspect}, got #{orientation.inspect}"
+          end
+
+          bridge.setScreenOrientation(orientation.to_s.upcase)
+        end
+
+        def orientation
+          bridge.getScreenOrientation.to_sym.downcase
+        end
+
+      end # Rotatable
+    end # DriverExtensions
+  end # WebDriver
+end # Selenium

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

@@ -20,6 +20,16 @@ module Selenium
           tmp_files << file
         end
 
+        def reap(file)
+          return unless reap?
+
+          unless tmp_files.include?(file)
+            raise Error::WebDriverError, "file not added for reaping: #{file.inspect}"
+          end
+
+          FileUtils.rm_rf tmp_files.delete(file)
+        end
+
         def reap!
           tmp_files.each { |file| FileUtils.rm_rf(file) } if reap?
         end

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

@@ -0,0 +1,119 @@
+module Selenium
+  module WebDriver
+    class Proxy
+      TYPES = {
+        :direct      => "DIRECT",     # Direct connection, no proxy (default on Windows).
+        :manual      => "MANUAL",     # Manual proxy settings (e.g., for httpProxy).
+        :pac         => "PAC",        # Proxy autoconfiguration from URL.
+        :auto_detect => "AUTODETECT", # Proxy autodetection (presumably with WPAD).
+        :system      => "SYSTEM"      # Use system settings (default on Linux).
+      }
+
+      attr_reader :type,
+                  :ftp,
+                  :http,
+                  :no_proxy,
+                  :pac,
+                  :ssl,
+                  :auto_detect
+
+      def initialize(opts = {})
+        opts = opts.dup
+
+        self.type        = opts.delete(:type) if opts.has_key? :type
+        self.ftp         = opts.delete(:ftp) if opts.has_key? :ftp
+        self.http        = opts.delete(:http) if opts.has_key? :http
+        self.no_proxy    = opts.delete(:no_proxy) if opts.has_key? :no_proxy
+        self.ssl         = opts.delete(:ssl) if opts.has_key? :ssl
+        self.pac         = opts.delete(:pac) if opts.has_key? :pac
+        self.auto_detect = opts.delete(:auto_detect) if opts.has_key? :auto_detect
+
+        unless opts.empty?
+          raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
+        end
+      end
+
+      def ==(other)
+        return false unless other.kind_of? self.class
+        as_json == other.as_json
+      end
+      alias_method :eql?, :==
+
+
+      def ftp=(value)
+        self.type = :manual
+        @ftp = value
+      end
+
+      def http=(value)
+        self.type = :manual
+        @http = value
+      end
+
+      def no_proxy=(value)
+        self.type = :manual
+        @no_proxy = value
+      end
+
+      def ssl=(value)
+        self.type = :manual
+        @ssl = value
+      end
+
+      def pac=(url)
+        self.type = :pac
+        @pac = url
+      end
+
+      def auto_detect=(bool)
+        self.type = :auto_detect
+        @auto_detect = bool
+      end
+
+      def type=(type)
+        unless TYPES.has_key? type
+          raise ArgumentError, "invalid proxy type: #{type.inspect}, expected one of #{TYPES.keys.inspect}"
+        end
+
+        if @type && type != @type
+          raise ArgumentError, "incompatible proxy type #{type.inspect} (already set to #{@type.inspect})"
+        end
+
+        @type = type
+      end
+
+      def as_json(opts = nil)
+        json_result = {
+          "proxyType" => TYPES[type]
+        }
+
+        json_result["ftpProxy"]           = ftp if ftp
+        json_result["httpProxy"]          = http if http
+        json_result["noProxy"]            = no_proxy if no_proxy
+        json_result["proxyAutoconfigUrl"] = pac if pac
+        json_result["sslProxy"]           = ssl if ssl
+        json_result["autodetect"]         = auto_detect if auto_detect
+
+        json_result if json_result.length > 1
+      end
+
+      class << self
+        def json_create(data)
+          proxy = new
+
+          proxy.type        = data['proxyType'].downcase.to_sym if data.has_key? 'proxyType'
+          proxy.ftp         = data['ftpProxy'] if data.has_key? 'ftpProxy'
+          proxy.http        = data['httpProxy'] if data.has_key? 'httpProxy'
+          proxy.no_proxy    = data['noProxy'] if data.has_key? 'noProxy'
+          proxy.pac         = data['proxyAutoconfigUrl'] if data.has_key? 'proxyAutoconfigUrl'
+          proxy.ssl         = data['sslProxy'] if data.has_key? 'sslProxy'
+          proxy.auto_detect = data['autodetect'] if data.has_key? 'autodetect'
+
+          proxy
+        end
+
+      end # class << self
+
+    end # Proxy
+  end # WebDriver
+end # Selenium

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

@@ -12,23 +12,30 @@ module Selenium
       end
 
       #
-      # @return true if the socket can be connected to
+      # Returns true if the server is listening within the given timeout,
+      # false otherwise.
+      #
+      # @return [Boolean]
       #
 
-      def success?
-        max_time = Time.now + @timeout
+      def connected?
+        with_timeout { listening? }
+      end
 
-        (
-          return true if can_connect?
-          wait
-        ) until Time.now >= max_time
+      #
+      # Returns true if the server has stopped listening within the given timeout,
+      # false otherwise.
+      #
+      # @return [Boolean]
+      #
 
-        false
+      def closed?
+        with_timeout { not listening? }
       end
 
       private
 
-      def can_connect?
+      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
@@ -38,6 +45,17 @@ module Selenium
         false
       end
 
+      def with_timeout(&blk)
+        max_time = Time.now + @timeout
+
+        (
+          return true if yield
+          wait
+        ) until Time.now > max_time
+
+        false
+      end
+
       def wait
         sleep @interval
       end

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

@@ -16,15 +16,16 @@ module Selenium
         def start_with(profile, profile_path, *args)
           profile_path = profile_path.gsub("/", "\\") if Platform.win?
 
-          ENV['XRE_PROFILE_PATH'] = profile_path
-          ENV['MOZ_NO_REMOTE'] = '1' # able to launch multiple instances
+          ENV['XRE_CONSOLE_LOG']           = profile.log_file if profile.log_file
+          ENV['XRE_PROFILE_PATH']          = profile_path
+          ENV['MOZ_NO_REMOTE']             = '1' # able to launch multiple instances
+          ENV['MOZ_CRASHREPORTER_DISABLE'] = '1' # disable breakpad
+          ENV['NO_EM_RESTART']             = '1' # prevent the binary from detaching from the console
 
           if Platform.linux? && (profile.native_events? || profile.load_no_focus_lib?)
             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
@@ -45,7 +46,9 @@ module Selenium
 
         def execute(*extra_args)
           args = [self.class.path, "-no-remote", "--verbose"] + extra_args
-          @process = ChildProcess.build(*args).start
+          @process = ChildProcess.build(*args)
+          @process.io.inherit! if $DEBUG
+          @process.start
         end
 
         def cope_with_mac_strangeness(args)

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

@@ -6,9 +6,8 @@ module Selenium
       class Bridge < Remote::Bridge
 
         def initialize(opts = {})
-          @binary     = Binary.new
           @launcher   = Launcher.new(
-            @binary,
+            Binary.new,
             opts.delete(:port) || DEFAULT_PORT,
             opts.delete(:profile)
           )
@@ -41,7 +40,7 @@ module Selenium
 
         def quit
           super
-          @binary.quit
+          @launcher.quit
 
           nil
         end

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

@@ -11,31 +11,34 @@ module Selenium
             raise Error::WebDriverError, "could not find extension at #{path.inspect}"
           end
 
-          @path = path
+          @path             = path
+          @should_reap_root = false
         end
 
         def write_to(extensions_dir)
-          ext_path = File.join extensions_dir, read_id_from_install_rdf(root)
+          root_dir = create_root
+          ext_path = File.join extensions_dir, read_id_from_install_rdf(root_dir)
 
           FileUtils.rm_rf ext_path
           FileUtils.mkdir_p File.dirname(ext_path), :mode => 0700
-          FileUtils.cp_r root, ext_path
+          FileUtils.cp_r root_dir, ext_path
+
+          FileReaper.reap(root_dir) if @should_reap_root
         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)
+        def create_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
-          )
+
+            @should_reap_root = true
+            Zipper.unzip(@path)
+          end
         end
 
         def read_id_from_install_rdf(directory)

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

@@ -40,6 +40,11 @@ module Selenium
           self
         end
 
+        def quit
+          @binary.quit
+          FileReaper.reap(@profile_dir) if @profile_dir
+        end
+
         def find_free_port
           port = @port
 
@@ -65,13 +70,14 @@ module Selenium
 
         def start_silent_and_wait
           assert_profile
-          @binary.start_with @profile, @profile_dir, "--silent"
+          @binary.start_with @profile, @profile_dir, "-silent"
           @binary.wait
         end
 
         def connect_until_stable
           poller = SocketPoller.new(@host, @port, STABLE_CONNECTION_TIMEOUT)
-          unless poller.success?
+          unless poller.connected?
+            @binary.quit
             raise Error::WebDriverError, "unable to obtain stable firefox connection in #{STABLE_CONNECTION_TIMEOUT} seconds"
           end
         end

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

@@ -156,8 +156,47 @@ module Selenium
           @untrusted_issuer = bool
         end
 
+        def proxy=(proxy)
+          unless proxy.kind_of? Proxy
+            raise TypeError, "expected #{Proxy.name}, got #{proxy.inspect}:#{proxy.class}"
+          end
+
+          case proxy.type
+          when :manual
+            self['network.proxy.type'] = 1
+
+            set_manual_proxy_preference "ftp", proxy.ftp
+            set_manual_proxy_preference "http", proxy.http
+            set_manual_proxy_preference "ssl", proxy.ssl
+
+            if proxy.no_proxy
+              self["network.proxy.no_proxies_on"] = proxy.no_proxy
+            else
+              self["network.proxy.no_proxies_on"] = ""
+            end
+          when :pac
+            self['network.proxy.type'] = 2
+            self['network.proxy.autoconfig_url'] = proxy.pac
+          when :auto_detect
+            self['network.proxy.type'] = 4
+          else
+            raise ArgumentError, "unsupported proxy type #{proxy.type}"
+          end
+
+          proxy
+        end
+
         private
 
+        def set_manual_proxy_preference(key, value)
+          return unless value
+
+          host, port = value.to_s.split(":", 2)
+
+          self["network.proxy.#{key}"] = host
+          self["network.proxy.#{key}_port"] = Integer(port) if port
+        end
+
         def install_extensions(directory)
           destination = File.join(directory, "extensions")
 
@@ -267,7 +306,10 @@ module Selenium
           "browser.shell.checkDefaultBrowser"         => 'false',
           "browser.tabs.warnOnClose"                  => 'false',
           "browser.tabs.warnOnOpen"                   => 'false',
+          "devtools.errorconsole.enabled"             => 'true',
           "dom.disable_open_during_load"              => 'false',
+          "dom.max_script_run_time"                   => '30',
+          "extensions.logging.enabled"                => 'true',
           "extensions.update.enabled"                 => 'false',
           "extensions.update.notifyUser"              => 'false',
           "network.manage-offline-status"             => 'false',
@@ -283,8 +325,10 @@ module Selenium
           "security.warn_viewing_mixed"               => 'false',
           "security.warn_viewing_mixed.show_once"     => 'false',
           "signon.rememberSignons"                    => 'false',
+          "toolkit.networkmanager.disable"            => 'true',
           "javascript.options.showInConsole"          => 'true',
-          "browser.dom.window.dump.enabled"           => 'true'
+          "browser.dom.window.dump.enabled"           => 'true',
+          "dom.report_all_js_exceptions"              => "true"
         }.freeze
 
       end # Profile