selenium-webdriver 0.0.18 → 0.0.19

data/chrome/src/extension/background.js

@@ -180,6 +180,19 @@ ChromeDriver.timeoutUntilGiveUpOnContentScriptLoading = 5000;
  */
 ChromeDriver.currentlyWaitingUntilGiveUpOnContentScriptLoading;
 
+/**
+ * The amount of time, in milliseconds, to wait for an element to be located
+ * when performing a search.
+ * When searching for a single element, the driver will wait up to this amount
+ * of time for the element to be located before returning an error.
+ * When searching for multiple elements, the driver will wait up to this amount
+ * of time for at least one element to be located before returning an empty
+ * list.
+ * @type {number}
+ * @private
+ */
+ChromeDriver.implicitWait_ = 0;
+
 //Set ChromeDriver.currentlyWaitingUntilGiveUpOnContentScriptLoading;
 resetCurrentlyWaitingOnContentScriptTime();
 
@@ -488,6 +501,10 @@ function parseRequest(request) {
   case "screenshot":
     getScreenshot();
     break;
+  case "implicitlyWait":
+    ChromeDriver.implicitWait_ = request.ms || 0;
+    sendResponseToParsedRequest({status: 0});
+    break;
   case "clickElement":
   case "hoverOverElement":
     // Falling through, as native events are handled the same
@@ -547,7 +564,8 @@ function parseRequest(request) {
     ChromeDriver.requestSequenceNumber++;
     sendMessageOnActivePortAndAlsoKeepTrackOfIt({
       request: request,
-      sequenceNumber: sequenceNumber
+      sequenceNumber: sequenceNumber,
+      implicitWait: ChromeDriver.implicitWait_
     });
     break;
   }

data/chrome/src/extension/content_script.js

@@ -114,21 +114,12 @@ function parsePortMessage(message) {
       response.wait = false;
       break;
     case "findChildElement":
-      response.value = getElement(false, message.request.using, message.request.value, message.request.id);
-      response.wait = false;
-      break;
     case "findChildElements":
-      response.value = getElement(true, message.request.using, message.request.value, message.request.id);
-      response.wait = false;
-      break;
     case "findElement":
-      response.value = getElement(false, message.request.using, message.request.value);
-      response.wait = false;
-      break;
     case "findElements":
-      response.value = getElement(true, message.request.using, message.request.value);
       response.wait = false;
-      break;
+      findElement(message, response);
+      return;  // Nothing more to do.
     case "getElementAttribute":
       response.value = getElementAttribute(element, message.request.name);
       response.wait = false;
@@ -419,22 +410,95 @@ function setCookie(cookie) {
   }
 }
 
+/**
+ * Responds to a request to find an element on the page.
+ * @param {Object} message The request from the background page.
+ * @param {Object} resp The response to send when the search has completed.
+ */
+function findElement(message, resp) {
+  var req = message.request;
+  var startTime = new Date().getTime();
+  var plural = req.request == 'findChildElements' ||
+               req.request == 'findElements';
+  var wait = message.implicitWait;
+
+  function send(response) {
+    ChromeDriverContentScript.port.postMessage({
+      response: response,
+      sequenceNumber: message.sequenceNumber
+    });
+    console.log("Sent response: " + JSON.stringify(response) +
+        " (seq:" + message.sequenceNumber + ")");
+  }
+
+  function doSearch() {
+    var found;
+    try {
+      found = getElement(req.using, req.value, req.id);
+    } catch (ex) {
+      console.error('Caught exception; sending error response', ex);
+      send({
+        statusCode: 13,
+        value: {
+          message: "An unexpected error occured while executing " +
+              req.request + ", exception dump: " + ex
+        }
+      });
+    }
+
+    var done = !wait || found.length;
+    if (done) {
+      if (!plural && !found.length) {
+        resp.value = {
+          statusCode: 7,
+          value: {
+            message: 'After ' + (new Date().getTime() - startTime) + 'ms, ' +
+                'unable to find element with ' +
+                req.using + ' ' + req.value
+          }
+        };
+      } else {
+        resp.value = {
+          statusCode: 0,
+          value: (plural ? found : found[0])
+        };
+      }
+      send(resp);
+    } else if (new Date().getTime() - startTime > wait) {
+      if (plural) {
+        resp.value = {statusCode: 0, value: []};
+      } else {
+        resp.value = {
+          statusCode: 7,
+          value: {
+            message: 'Unable to find element with ' +
+                req.using + ' ' + req.value
+          }
+        };
+      }
+      send(resp);
+    } else {
+      setTimeout(doSearch, 100);
+    }
+  }
+
+  doSearch();
+}
+
+
 /**
  * Get an element, or a set of elements, by some lookup
- * Called by both findElement and findElements
- * @param plural true if want array of all elements, false if singular element
- * @param parsed array showing how to look up, e.g. ["id", "cheese"] or
- *               [{"id": 0, using: "id", value: "cheese"}]
+ * @param {string} lookupBy The lookup strategy to use.
+ * @param {string} lookupValue What to lookup.
+ * @param {string} id Internal ID of the parent element to restrict the lookup
+ *     to.
+ * @return {Array} An array of the elements matching the search criteria.
  */
-function getElement(plural, lookupBy, lookupValue, id) {
+function getElement(lookupBy, lookupValue, id) {
   var root = "";
   var parent = null;
   if (id !== undefined && id != null) {
-    try {
-      parent = internalGetElement(id);
-    } catch (e) {
-      return e;
-    }
+    parent = internalGetElement(id);
     //Looking for children
     root = getXPathOfElement(parent);
   } else {
@@ -483,38 +547,20 @@ function getElement(plural, lookupBy, lookupValue, id) {
   if (attribute != '') {
     elements = getElementsByXPath(root + "//*[@" + attribute + "='" + lookupValue + "']");
   }
+
   if (elements == null || elements.length == 0) {
-    if (plural) {
-      //Fine, no elements matched
-      return {statusCode: 0, value: []};
-    } else {
-      //Problem - we were expecting an element
-      return {statusCode: 7, value: {
-          message: "Unable to find element with " + lookupBy + " " + lookupValue}};
-    }
-  } else {
-    var toReturn;
-    if (plural) {
-      toReturn = [];
-      //Add all found elements to the page's elements, and push each to the array to return
-      var addedElements = addElementsToInternalArray(elements);
-      for (var addedElement in addedElements) {
-        toReturn.push({
-          'ELEMENT': addedElements[addedElement].toString()
-        });
-      }
-    } else {
-      if (!elements[0]) {
-        return {statusCode: 7, value: {
-          message: "Unable to find element with " + lookupBy + " " + lookupValue}};
-      }
-      //Add the first found elements to the page's elements, and push it to the array to return
-      toReturn = {
-        'ELEMENT': addElementToInternalArray(elements[0]).toString()
-      };
-    }
-    return {statusCode: 0, value: toReturn};
+    return [];
+  }
+
+  var toReturn = [];
+  //Add all found elements to the page's elements, and push each to the array to return
+  var addedElements = addElementsToInternalArray(elements);
+  for (var addedElement in addedElements) {
+    toReturn.push({
+      'ELEMENT': addedElements[addedElement].toString()
+    });
   }
+  return toReturn;
 }
 
 /**

data/chrome/src/extension/manifest-nonwin.json

@@ -1,6 +1,6 @@
 {
   "name": "WebDriver",
-  "version": "1.9.11",
+  "version": "1.9.12",
   "description": "WebDriver extension for Chrome",
   "browser_action": {
     "default_title": "WebDriver",

data/chrome/src/extension/manifest-win.json

@@ -1,6 +1,6 @@
 {
   "name": "WebDriver",
-  "version": "1.9.11",
+  "version": "1.9.12",
   "description": "WebDriver extension for Chrome",
   "browser_action": {
     "default_title": "WebDriver",

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

@@ -47,11 +47,11 @@ module Selenium
         end
 
         def findElementByCssSelector(parent, selector)
-          find_element_by 'css selector', selector, parent
+          find_element_by 'css', selector, parent
         end
 
         def findElementsByCssSelector(parent, selector)
-          find_elements_by 'css selector', selector, parent
+          find_elements_by 'css', selector, parent
         end
 
         def getAllCookies
@@ -62,6 +62,10 @@ module Selenium
           execute :deleteCookie, :name => name
         end
 
+        def setImplicitWaitTimeout(milliseconds)
+          execute :implicitlyWait, :ms => milliseconds
+        end
+
         private
 
         def execute(command_name, opts = {}, args = nil)

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

@@ -83,6 +83,7 @@ module Selenium
           @tmp_extension_dir ||= begin
             dir = Dir.mktmpdir("webdriver-chrome-extension")
             Platform.make_writable(dir)
+            FileReaper << dir
 
             dir
           end
@@ -92,6 +93,7 @@ module Selenium
           @tmp_profile_dir ||= begin
             dir = Dir.mktmpdir("webdriver-chrome-profile")
             Platform.make_writable(dir)
+            FileReaper << dir
 
             dir
           end

data/common/src/js/core/scripts/selenium-version.js

@@ -1,5 +1,5 @@
 Selenium.version = "2.0";
-Selenium.revision = "a2";
+Selenium.revision = "a4";
 
 window.top.document.title += " v" + Selenium.version + " [" + Selenium.revision + "]";
 

data/common/src/rb/CHANGES

@@ -0,0 +1,11 @@
+2010-05-31
+==========
+
+* Add a max redirect check to the remote driver
+* Add Firefox::Profile#assume_untrusted_certificate_issuer=
+* Add implicit waits (Selenium::WebDriver::Timeouts)
+* at_exit hook to clean temporary profiles
+* Fix for Errno::ECONNABORTED errors on Windows
+* Fix issue where Firefox::Profile#secure_ssl= would have no effect
+* Fix issue where locating elements by :css would fail in the Chrome driver.
+* IE driver now works on 64-bit rubies.

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

@@ -38,8 +38,10 @@ require "selenium/webdriver/core_ext/string"
 require "selenium/webdriver/error"
 require "selenium/webdriver/platform"
 require "selenium/webdriver/child_process"
+require "selenium/webdriver/file_reaper"
 require "selenium/webdriver/target_locator"
 require "selenium/webdriver/navigation"
+require "selenium/webdriver/timeouts"
 require "selenium/webdriver/options"
 require "selenium/webdriver/find"
 require "selenium/webdriver/driver_extensions/takes_screenshot"

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

@@ -0,0 +1,31 @@
+module Selenium
+  module WebDriver
+    module FileReaper
+
+      class << self
+        def reap=(bool)
+          @reap = bool
+        end
+
+        def reap?
+          @reap.nil? || @reap
+        end
+
+        def tmp_files
+          @tmp_files ||= []
+        end
+
+        def <<(file)
+          tmp_files << file
+        end
+
+        def reap!
+          tmp_files.each { |file| FileUtils.rm_rf(file) } if reap?
+        end
+      end
+
+      at_exit { reap! }
+
+    end # FileReaper
+  end # WebDriver
+end # Selenium

data/common/src/rb/lib/selenium/webdriver/options.rb

@@ -77,6 +77,10 @@ module Selenium
         @bridge.setSpeed(speed.to_s.upcase)
       end
 
+      def timeouts
+        @timeouts ||= Timeouts.new(@bridge)
+      end
+
     end # Options
   end # WebDriver
 end # Selenium

data/common/src/rb/lib/selenium/webdriver/platform.rb

@@ -10,35 +10,49 @@ module Selenium
 
       def home
         # jruby has an issue with ENV['HOME'] on Windows
-        @home ||= Platform.jruby? ? Java.java.lang.System.getProperty('user.home') : ENV['HOME']
+        @home ||= jruby? ? ENV_JAVA['user.home'] : ENV['HOME']
       end
 
       def platform
-        @platform ||= begin
+        @platform ||= (
           if defined? RUBY_ENGINE
             RUBY_ENGINE.to_sym
           else
             :ruby
           end
-        end
+        )
       end
 
       def os
-        @os ||= begin
-           case Config::CONFIG['host_os']
-           when /mswin|msys|mingw32/
-             :windows
-           when /darwin|mac os/
-             :macosx
-           when /linux/
-             :linux
-           when /solaris|bsd/
-             :unix
-           else
-             # unlikely
-             raise Error::WebDriverError, "unknown os #{Config::CONFIG['host_os']}"
-           end
-        end
+        @os ||= (
+          host_os = RbConfig::CONFIG['host_os']
+          case host_os
+          when /mswin|msys|mingw32/
+            :windows
+          when /darwin|mac os/
+            :macosx
+          when /linux/
+            :linux
+          when /solaris|bsd/
+            :unix
+          else
+            raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+          end
+        )
+      end
+
+      def bitsize
+        @bitsize ||= (
+          if defined?(FFI::BITSIZE)
+            FFI::BITSIZE
+          elsif defined?(FFI)
+            FFI.type_size :pointer
+          elsif jruby?
+            Integer(ENV_JAVA['sun.arch.data.model'])
+          else
+            1.size == 4 ? 32 : 64
+          end
+        )
       end
 
       def jruby?
@@ -98,5 +112,6 @@ if __FILE__ == $0
     :ruby19?  => Selenium::WebDriver::Platform.ruby19?,
     :jruby?   => Selenium::WebDriver::Platform.jruby?,
     :win?     => Selenium::WebDriver::Platform.win?,
-    :home     => Selenium::WebDriver::Platform.home
+    :home     => Selenium::WebDriver::Platform.home,
+    :bitsize  => Selenium::WebDriver::Platform.bitsize
 end

data/common/src/rb/lib/selenium/webdriver/timeouts.rb

@@ -0,0 +1,19 @@
+module Selenium
+  module WebDriver
+    class Timeouts
+
+      def initialize(bridge)
+        @bridge = bridge
+      end
+
+      #
+      # Set the amount of time the driver should wait when searching for elements.
+      #
+
+      def implicit_wait=(seconds)
+        @bridge.setImplicitWaitTimeout seconds * 1000
+      end
+
+    end # Timeouts
+  end # WebDriver
+end # Selenium