selenium-webdriver 0.0.8 → 0.0.9

data/common/src/js/webelement.js

@@ -25,7 +25,6 @@ goog.provide('webdriver.WebElement');
 goog.require('goog.array');
 goog.require('webdriver.By.Locator');
 goog.require('webdriver.By.Strategy');
-goog.require('webdriver.Command');
 goog.require('webdriver.CommandName');
 goog.require('webdriver.Future');
 
@@ -64,92 +63,6 @@ webdriver.WebElement = function(driver) {
 };
 
 
-/**
- * Regular expression for a UUID.
- * @type {RegExp}
- * @static
- */
-webdriver.WebElement.UUID_REGEX =
-    /^{[\da-z]{8}-[\da-z]{4}-[\da-z]{4}-[\da-z]{4}-[\da-z]{12}}$/i;
-
-
-/**
- * Adds a command to the given {@code webdriver.WebDriver} instance to find an
- * element on the page.
- * @param {webdriver.WebDriver} driver The driver to perform the search with.
- * @param {webdriver.By.Locator|{*: string}} locator The locator to use for
- *     finding the element, or a short-hand object that can be converted into a
- *     locator.
- * @return {webdriver.WebElement} A WebElement that can be used to issue
- *     commands on the found element.  The element's ID will be set
- *     asynchronously once the driver successfully finds the element.
- * @see webdriver.By.Locator.createFromObj
- */
-webdriver.WebElement.findElement = function(driver, locator) {
-  var webElement = new webdriver.WebElement(driver);
-  locator = webdriver.By.Locator.checkLocator(locator);
-  var command = driver.addCommand(webdriver.CommandName.FIND_ELEMENT).
-      setParameters(locator.type, locator.target);
-  webElement.getId().setValue(command.getFutureResult());
-  return webElement;
-};
-
-
-/**
- * Adds a command to the given {@code webdriver.WebDriver} instance to test if
- * an element is present on the page.
- * @param {webdriver.WebDriver} driver The driver to perform the search with.
- * @param {webdriver.By.Locator|{*: string}} locator The locator to use for
- *     finding the element, or a short-hand object that can be converted into a
- *     locator.
- * @return {webdriver.Future} A future whose value will be set when the driver
- *     completes the search; value will be {@code true} if the element was
- *     found, false otherwise.
- * @see webdriver.By.Locator.createFromObj
- */
-webdriver.WebElement.isElementPresent = function(driver, locator) {
-  var callback = function(response) {
-    // If returns without an error, element is present.
-    response.value = !response.isFailure;
-    // Go ahead and clear the error.
-    response.isFailure = false;
-  };
-  locator = webdriver.By.Locator.checkLocator(locator);
-  return driver.addCommand(webdriver.CommandName.FIND_ELEMENT).
-      setParameters(locator.type, locator.target).
-      setSuccessCallback(callback).
-      setFailureCallback(callback).
-      getFutureResult();
-};
-
-
-/**
- * Adds a command to the given {@code webdriver.WebDriver} instance to find
- * multiple elements on the page.
- * @param {webdriver.WebDriver} driver The driver to perform the search with.
- * @param {webdriver.By.Locator|{*: string}} locator The locator to use for
- *     finding the element, or a short-hand object that can be converted into a
- *     locator.
- * @see webdriver.By.Locator.createFromObj
- */
-webdriver.WebElement.findElements = function(driver, locator) {
-  locator = webdriver.By.Locator.checkLocator(locator);
-  driver.addCommand(webdriver.CommandName.FIND_ELEMENTS).
-      setParameters(locator.type, locator.target).
-      setSuccessCallback(function(response) {
-        var elements = [];
-        for (var i = 0, id; id = response.value[i]; i++) {
-          if (id) {
-            var element = new webdriver.WebElement(driver);
-            element.getId().setValue(id);
-            elements.push(element);
-          }
-        }
-        response.value = elements;
-      });
-};
-
-
 /**
  * Adds a command to determine if an element is present under this element in
  * the DOM tree.
@@ -162,22 +75,29 @@ webdriver.WebElement.findElements = function(driver, locator) {
  * @see webdriver.By.Locator.createFromObj
  */
 webdriver.WebElement.prototype.isElementPresent = function(locator) {
-  var callback = function(response) {
-    // If returns without an error, element is present.
-    response.value = !response.isFailure;
-    // Go ahead and clear the error (if any).
-    response.isFailure = false;
-  };
   locator = webdriver.By.Locator.checkLocator(locator);
-  return this.driver_.addCommand(webdriver.CommandName.FIND_CHILD_ELEMENT).
-      setParameters({
-        'id': this.getId(),
-        'using': locator.type,
-        'value': locator.target
-      }).
-      setSuccessCallback(callback).
-      setFailureCallback(callback).
-      getFutureResult();
+  return this.driver_.callFunction(function() {
+    var findCommand = this.driver_.
+        addCommand(webdriver.CommandName.FIND_CHILD_ELEMENT).
+        setParameters({
+          'id': this.getId(),
+          'using': locator.type,
+          'value': locator.target
+        });
+    var commandFailed = false;
+    var key = goog.events.listenOnce(findCommand,
+        webdriver.Command.ERROR_EVENT, function(e) {
+          commandFailed = true;
+          this.driver_.abortCommand(e.currentTarget);
+          e.preventDefault();
+          e.stopPropagation();
+          return false;
+        }, /*capture phase*/true, this);
+    return this.driver_.callFunction(function() {
+      goog.events.unlistenByKey(key);
+      return !commandFailed;
+    });
+  }, this);
 };
 
 
@@ -217,23 +137,25 @@ webdriver.WebElement.prototype.findElement = function(locator) {
  */
 webdriver.WebElement.prototype.findElements = function(locator) {
   locator = webdriver.By.Locator.checkLocator(locator);
-  this.driver_.addCommand(webdriver.CommandName.FIND_CHILD_ELEMENTS).
-      setParameters({
-        'id': this.getId(),
-        'using': locator.type,
-        'value': locator.target
-      }).
-      setSuccessCallback(function(response) {
-        var elements = [];
-        for (var i = 0, id; id = response.value[i]; i++) {
-          if (id) {
-            var element = new webdriver.WebElement(this.driver_);
-            element.getId().setValue(id);
-            elements.push(element);
-          }
+  this.driver_.callFunction(function() {
+    this.driver_.addCommand(webdriver.CommandName.FIND_CHILD_ELEMENTS).
+        setParameters({
+          'id': this.getId(),
+          'using': locator.type,
+          'value': locator.target
+        });
+    return this.driver_.callFunction(function(ids) {
+      var elements = [];
+      for (var i = 0; i < ids.length; i++) {
+        if (ids[i]) {
+          var element = new webdriver.WebElement(this.driver_);
+          element.getId().setValue(ids[i]);
+          elements.push(element);
         }
-        response.value = elements;
-      }, this);
+      }
+      return elements;
+    }, this);
+  }, this);
 };
 
 
@@ -454,12 +376,12 @@ webdriver.WebElement.prototype.dragAndDropTo = function(webElement) {
  *     enabled, as dictated by the {@code disabled} attribute.
  */
 webdriver.WebElement.prototype.isEnabled = function() {
-  return this.createCommand_(webdriver.CommandName.GET_ATTRIBUTE).
-      setParameters('disabled').
-      setSuccessCallback(function(response) {
-        response.value = !!!response.value;
-      }).
-      getFutureResult();
+  return this.driver_.callFunction(function() {
+    this.getAttribute('disabled');
+    return this.driver_.callFunction(function(value) {
+      return !!!value;
+    });
+  }, this);
 };
 
 
@@ -473,8 +395,8 @@ webdriver.WebElement.prototype.isEnabled = function() {
 webdriver.WebElement.prototype.isCheckedOrSelected_ = function() {
   return this.driver_.callFunction(function() {
     this.createCommand_(webdriver.CommandName.GET_TAG_NAME);
-    return this.driver_.callFunction(function(response) {
-      var attribute = response.value == 'input' ? 'checked' : 'selected';
+    return this.driver_.callFunction(function(prevResult) {
+      var attribute = prevResult == 'input' ? 'checked' : 'selected';
       return this.getAttribute(attribute);
     }, this);
   }, this);
@@ -506,7 +428,7 @@ webdriver.WebElement.prototype.isChecked = function() {
 webdriver.WebElement.prototype.toggle = function() {
   return this.driver_.callFunction(function() {
     this.createCommand_(webdriver.CommandName.TOGGLE);
-    return this.driver_.callFunction(this.isCheckedOrSelected_, this);
+    return this.isCheckedOrSelected_();
   }, this);
 };
 

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

@@ -47,23 +47,29 @@ module Selenium
       end
 
       def kill
-        Process.kill("TERM", @pid) if @pid
+        Process.kill('TERM', @pid) if @pid
       end
 
       def kill!
-        Process.kill("KILL", @pid) if @pid
+        Process.kill('KILL', @pid) if @pid
       end
 
       module WindowsProcess
         def start
           require "win32/process" # adds a dependency on windows
-          @pid = Process.create(:app_name        => @args.join(" "),
-                                :process_inherit => true,
-                                :thread_inherit  => true,
-                                :inherit         => true).process_id
+          @pid = Process.create(
+            :app_name        => @args.join(" "),
+            :process_inherit => true,
+            :thread_inherit  => true,
+            :inherit         => true
+          ).process_id
 
           self
         end
+
+        def kill
+          kill!
+        end
       end
 
       module JRubyProcess

data/firefox/src/extension/components/badCertListener.js

@@ -82,7 +82,7 @@ WdCertOverrideService.prototype.hasMatchingOverride = function(
         this.ERROR_TIME;
     localdump("Bits: " + aOverrideBits.value);
   } else {
-    retval = this.origListener.hasMatchingOverride(aHostName, aPort,
+    retval = this.origListener_.hasMatchingOverride(aHostName, aPort,
               aCert, aOverrideBits, aIsTemporary);
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jari Bakken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-29 00:00:00 +01:00
+date: 2009-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,10 +86,10 @@ files:
 - common/src/js/extension/README
 - common/src/js/factory.js
 - common/src/js/future.js
+- common/src/js/jsunit.js
 - common/src/js/key.js
 - common/src/js/localcommandprocessor.js
-- common/src/js/logging.js
-- common/src/js/testrunner.js
+- common/src/js/testcase.js
 - common/src/js/timing.js
 - common/src/js/webdriver.js
 - common/src/js/webelement.js
@@ -143,7 +143,11 @@ files:
 - jobbie/src/rb/lib/selenium/webdriver/ie/util.rb
 - jobbie/src/rb/lib/selenium/webdriver/ie.rb
 - jobbie/prebuilt/Win32/Release/InternetExplorerDriver.dll
+- jobbie/prebuilt/Win32/Release/webdriver-ie-test.dll
+- jobbie/prebuilt/Win32/Release/webdriver-ie.dll
 - jobbie/prebuilt/x64/Release/InternetExplorerDriver.dll
+- jobbie/prebuilt/x64/Release/webdriver-ie-test.dll
+- jobbie/prebuilt/x64/Release/webdriver-ie.dll
 - remote/client/src/rb/lib/selenium/webdriver/remote/bridge.rb
 - remote/client/src/rb/lib/selenium/webdriver/remote/capabilities.rb
 - remote/client/src/rb/lib/selenium/webdriver/remote/commands.rb

data/common/src/js/logging.js

@@ -1,249 +0,0 @@
-/** @license
-Copyright 2007-2009 WebDriver committers
-Copyright 2007-2009 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/**
- * @fileoverview Defines a logging API that logs to a DOM on the current page as
- *     well as the Firebug console.
- * @author jmelyba@gmail.com (Jason Leyba)
- */
-
-goog.provide('webdriver.logging');
-goog.provide('webdriver.logging.Level');
-
-goog.require('goog.dom');
-goog.require('goog.string');
-
-
-/**
- * Represents a level that can be used to filter log messages.
- * @param {number} code Numeric value for this level.
- * @param {string} firebugLogFnName The name of the firebug function to use for
- *    logging messages at this level to the console.
- * @param {string} domColor The color string to use for logging messages to the
- *    DOM at this level.
- * @constructor
- */
-webdriver.logging.Level = function(code, firebugLogFnName, domColor) {
-  this.code = code;
-  this.firebugLogFnName = firebugLogFnName;
-  this.domColor = domColor;
-};
-
-
-webdriver.logging.Level.ERROR = new webdriver.logging.Level(0, 'error', 'red');
-webdriver.logging.Level.WARN = new webdriver.logging.Level(1, 'warn', 'orange');
-webdriver.logging.Level.INFO = new webdriver.logging.Level(2, 'info', 'black');
-webdriver.logging.Level.DEBUG = new webdriver.logging.Level(3, 'debug', 'gray');
-
-
-/**
- * A reference to the Firebug console.  Will be undefined if the current browser
- * does not have Firebug installed (or if the current browser is not Firefox).
- * @type {?Object}
- * @private
- */
-webdriver.logging.console_ = window['console'];
-
-
-/**
- * Whether to log to the Firebug console if it is available.
- * @type {boolean}
- * @private
- */
-webdriver.logging.firebugLogging_ = false;
-
-
-/**
- * Whether to log messages to the DOM.
- * @type {boolean}
- * @private
- */
-webdriver.logging.domLogging_ = true;
-
-
-/**
- * The current logging level.  Messages below this level will not be logged.
- * @type {webdriver.logging.Level}
- * @private
- */
-webdriver.logging.currentLevel_ = webdriver.logging.Level.INFO;
-
-
-/**
- * @param {boolean} enable Whether to enable logging to the Firebug console.
- */
-webdriver.logging.enableFirebugLogging = function(enable) {
-  webdriver.logging.firebugLogging_ = enable;
-};
-
-
-/**
- * @param {boolean} enable Whether to enable logging to the DOM.
- */
-webdriver.logging.enableDomLogging = function(enable) {
-  webdriver.logging.domLogging_ = enable;
-};
-
-
-/**
- * @param {webdriver.logging.Level} newLevel The new level to filter messages
- *     by.
- */
-webdriver.logging.setLevel = function (newLevel) {
-  webdriver.logging.currentLevel_ = newLevel;
-};
-
-
-/**
- * Clears all log messages.
- */
-webdriver.logging.clear = function() {
-  if (webdriver.logging.div_) {
-    goog.dom.setTextContent(webdriver.logging.div_, '');
-  }
-
-  if (webdriver.logging.firebugLogging_ &&
-      webdriver.logging.console_ &&
-      goog.isFunction(webdriver.logging.console_['clear'])) {
-    webdriver.logging.console_['clear']();
-  }
-};
-
-
-/**
- * Utility function for logging status messages.
- * @param {string} msg The message to log.
- * @param {?webdriver.logging.Level} opt_logLevel The level to log the message
- *     at. Defaults to {@code webdriver.LogLevel.INFO}.
- */
-webdriver.logging.log = function(msg, opt_logLevel) {
-  var logLevel = opt_logLevel || webdriver.logging.Level.INFO;
-  if (logLevel.code > webdriver.logging.currentLevel_.code) {
-    return;
-  }
-
-  msg = '[' + goog.now() + ']: ' + msg;
-
-  if (webdriver.logging.firebugLogging_) {
-    var consoleLoggerFn = webdriver.logging.console_ ?
-        (webdriver.logging.console_[logLevel.firebugLogFnName] ||
-         webdriver.logging.console_['log']) : null;
-    if (goog.isFunction(consoleLoggerFn)) {
-      consoleLoggerFn(msg);
-    }
-  }
-
-  if (!webdriver.logging.domLogging_) {
-    return;
-  }
-
-  if (!webdriver.logging.div_) {
-    webdriver.logging.div_ = goog.dom.createDom('DIV', {
-      style: 'border: 1px solid black; margin: 3px; padding: 3px'
-    });
-    goog.dom.appendChild(goog.dom.getDocument().body, webdriver.logging.div_);
-  }
-
-  var logRecord = goog.dom.createDom('DIV', {
-    style: ('font-family: Courier; font-size: 9pt; ' +
-            'color: ' + logLevel.domColor + ';' +
-            'border-top: 1px solid silver;')
-  });
-  logRecord.innerHTML = webdriver.logging.jsStringToHtml(msg);
-  goog.dom.appendChild(webdriver.logging.div_, logRecord);
-};
-
-
-/**
- * Escapes a JavaScript string so it can be inserted as HTML.
- * - Converts newlines to BR tags
- * - Replaces all whitespace with {@code nbsp;}
- * - Escapes all appropriate characters with HTML entities (<, >, etc.)
- * @param {string} str The string to convert to HTML.
- * @return {string} The converted string.
- */
-webdriver.logging.jsStringToHtml = function(str) {
-  str = goog.string.canonicalizeNewlines(str);
-  str = goog.string.htmlEscape(str);
-  return str.replace(/\n/g, '<br/>').replace(/\s/g, '&nbsp;');
-};
-
-
-/**
- * An alias for {@code webdriver.logging.log} used to log messages at the
- * {@code DEBUG} level.
- * @param {string} message The message to log.
- */
-webdriver.logging.debug = function(message) {
-  webdriver.logging.log(message, webdriver.logging.Level.DEBUG);
-};
-
-
-/**
- * An alias for {@code webdriver.logging.log} used to log messages at the
- * {@code INFO} level.
- * @param {string} message The message to log.
- */
-webdriver.logging.info = function(message) {
-  webdriver.logging.log(message, webdriver.logging.Level.INFO);
-};
-
-
-/**
- * An alias for {@code webdriver.logging.log} used to log messages at the
- * {@code WARN} level.
- * @param {string} message The message to log.
- */
-webdriver.logging.warn = function(message) {
-  webdriver.logging.log(message, webdriver.logging.Level.WARN);
-};
-
-
-/**
- * An alias for {@code webdriver.logging.log} used to log messages at the
- * {@code ERROR} level.
- * @param {string} message The message to log.
- */
-webdriver.logging.error = function(message) {
-  webdriver.logging.log(message, webdriver.logging.Level.ERROR);
-};
-
-
-/**
- * Utility function for recursively describing all of the properties in an
- * object using a DFS traversal.
- * @param {*} obj The object to describe.
- * @param {string} opt_indent Indentation for the current DFS level.
- * @return {string} The object description.
- */
-webdriver.logging.describe = function(obj, opt_indent) {
-  var indent = opt_indent || '';
-  var msgLines = [];
-  if (goog.isString(obj)) {
-    msgLines.push(indent + ' (' + goog.typeOf(obj) + ') ' + obj);
-  } else {
-    for (var prop in obj) {
-      msgLines.push(
-        indent + prop + ': (' + goog.typeOf(obj[prop]) + ') ' + obj[prop]);
-      if (goog.isObject(obj[prop]) && !goog.isFunction(obj[prop]) &&
-          goog.isArray(obj[prop])) {
-        msgLines.push(webdriver.logging.describe(obj[prop], indent + '  '));
-      }
-    };
-  }
-  return msgLines.join('\n');
-};