selenium-webdriver 0.0.8 → 0.0.9

data/chrome/src/extension/content_script.js

@@ -77,11 +77,16 @@ function parsePortMessage(message) {
     element.scrollIntoView(true);
     //TODO: Work out a way of firing events,
     //now that synthesising them gives appendMessage errors
+    console.log("mouse downing");
     Utils.fireMouseEventOn(element, "mousedown");
+      console.log("mouse up");
     Utils.fireMouseEventOn(element, "mouseup");
+      console.log("mouse click");
     Utils.fireMouseEventOn(element, "click");
+
     if (element.click) {
-      element.click();
+      console.log("click");
+      execute("try { arguments[0].click(); } catch(e){}", {type: "ELEMENT", value: getElementId_(element)});
     }
     response.value = {statusCode: 0};
     break;
@@ -535,6 +540,23 @@ function internalGetElement(elementIdAsString) {
   }
 }
 
+/**
+ * Given an element, returning the index that can be used to locate it
+ *
+ * @param element the element to look up the internal ID of
+ * @return A positive integer on success or -1 otherwise
+ */
+function getElementId_(element) {
+  var length = ChromeDriverContentScript.internalElementArray.length;
+  for (var i = 0; i < length; i++) {
+    if (ChromeDriverContentScript.internalElementArray[i] === element) {
+      return i;
+    }
+  }
+
+  return -1;
+}
+
 /**
  * Ensures the passed element is in view, so that the native click event can be sent
  * @return object to send back to background page to trigger a native click
@@ -763,6 +785,8 @@ function toggleElement(element) {
   } catch (e) {
     return e;
   }
+  console.log("New value: " + newValue);
+  
   if (changed) {
     //TODO: Work out a way of firing events,
     //now that synthesising them gives appendMessage errors
@@ -842,9 +866,10 @@ function parseWrappedArguments(argument) {
  * We can't share objects between content script and page, so have to wrap up arguments as JSON
  * @param script script to execute as a string
  * @param passedArgs array of arguments to pass to the script
+ * @param callback function to call when the result is returned
  */
-function execute(script, passedArgs) {
-  console.log("execing " + script + ", args: " + JSON.stringify(passedArgs));
+function execute_(script, passedArgs, callback) {
+  console.log("executing " + script + ", args: " + JSON.stringify(passedArgs));
   var func = "function(){" + script + "}";
   var args = [];
   for (var i = 0; i < passedArgs.length; ++i) {
@@ -899,11 +924,15 @@ function execute(script, passedArgs) {
                         '}' +
                         'document.getElementsByTagName("script")[document.getElementsByTagName("script").length - 1].dispatchEvent(e);' +
                         'document.getElementsByTagName("html")[0].removeChild(document.getElementsByTagName("script")[document.getElementsByTagName("script").length - 1]);';
-  scriptTag.addEventListener('DOMAttrModified', returnFromJavascriptInPage, false);
+  scriptTag.addEventListener('DOMAttrModified', callback, false);
   console.log("Injecting script element");
   ChromeDriverContentScript.currentDocument.getElementsByTagName("html")[0].appendChild(scriptTag);
 }
 
+function execute(script, passedArgs) {
+  execute_(script, passedArgs, returnFromJavascriptInPage);
+}
+
 function parseReturnValueFromScript(result) {
   console.log("Parsing: " + JSON.stringify(result));
   var value = {"type":"NULL"};
@@ -944,7 +973,7 @@ function returnFromJavascriptInPage(e) {
   console.log("Result was: " + e.newValue.value);
   var result = JSON.parse(e.newValue).value;
   var value = parseReturnValueFromScript(result);
-  console.log("reutrn value: " + JSON.stringify(value));
+  console.log("Return value: " + JSON.stringify(value));
   ChromeDriverContentScript.port.postMessage({sequenceNumber: ChromeDriverContentScript.currentSequenceNumber, response: {response: "execute", value: {statusCode: 0, value: value}}});
 }
 

data/chrome/src/extension/utils.js

@@ -150,13 +150,11 @@ Utils.getStyleProperty = function(node, propertyName) {
 function collapseWhitespace(textSoFar) {
     return textSoFar.replace(/\s+/g, " ");
 }
-;
 
 function getPreformattedText(node) {
     var textToAdd = "";
     return getTextFromNode(node, "", textToAdd, true)[1];
 }
-;
 
 function isWhiteSpace(character) {
     return character == '\n' || character == ' ' || character == '\t' || character == '\r';
@@ -177,9 +175,19 @@ Utils.getText = function(element) {
 };
 
 Utils.fireHtmlEvent = function(element, eventName) {
-    var e = document.createEvent("HTMLEvents");
-    e.initEvent(eventName, true, true);
-    element.dispatchEvent(e);
+    var args = [
+      {type: "ELEMENT", value: getElementId_(element)},
+      {type: "STRING", value: eventName}
+    ];
+
+    // We need to do this because event handlers refer to functions that
+    // the content script can't reah. See:
+    // http://code.google.com/p/chromium/issues/detail?id=29071
+    var script = "var e = document.createEvent('HTMLEvents'); "
+      + "e.initEvent(arguments[1], true, true); " 
+      + "arguments[0].dispatchEvent(e);";
+
+    execute_(script, args, function(){});
 };
 
 
@@ -188,9 +196,22 @@ Utils.fireMouseEventOn = function(element, eventName) {
 };
 
 Utils.triggerMouseEvent = function(element, eventType, clientX, clientY) {
-    var event = element.ownerDocument.createEvent("MouseEvents");
-    var view = element.ownerDocument.defaultView;
-
-    event.initMouseEvent(eventType, true, true, view, 1, 0, 0, clientX, clientY, false, false, false, false, 0, element);
-    element.dispatchEvent(event);
+    var args = [
+      {type: "ELEMENT", value: getElementId_(element)},
+      {type: "STRING", value: eventType},
+      {type: "NUMBER", value: clientX},
+      {type: "NUMBER", value: clientY}
+    ];
+
+    // We need to do this because event handlers refer to functions that
+    // the content script can't reah. See:
+    // http://code.google.com/p/chromium/issues/detail?id=29071
+    var script =
+        "var event = arguments[0].ownerDocument.createEvent('MouseEvents'); "
+        + "var view = arguments[0].ownerDocument.defaultView; "
+        + "event.initMouseEvent(arguments[1], true, true, view, 1, 0, 0, arguments[2], arguments[3], false, false, false, false, 0, arguments[0]);"
+        + " arguments[0].dispatchEvent(event);";
+
+    execute_(script, args, function(){});
 };
+

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

@@ -56,8 +56,12 @@ module Selenium
         end
 
         def quit
-          @launcher.kill # FIXME: let chrome extension take care of this
-          execute :request => 'quit'
+          begin
+            execute :request => 'quit'
+          rescue IOError
+          end
+
+          @launcher.kill
           @executor.close
         end
 
@@ -92,6 +96,7 @@ module Selenium
                          :script  => script,
                          :args    => typed_args
 
+          return if resp.nil?
           unwrap_script_argument resp
         end
 
@@ -310,7 +315,10 @@ module Selenium
         private
 
         def execute(command)
+          puts "--> #{command.inspect}" if $DEBUG
           resp = raw_execute command
+          puts "<-- #{resp.inspect}" if $DEBUG
+
           code = resp['statusCode']
           if e = Error.for_code(code)
             msg = resp['value']['message'] if resp['value']

data/common/src/js/abstractcommandprocessor.js

@@ -26,9 +26,9 @@ goog.require('goog.Disposable');
 goog.require('goog.array');
 goog.require('goog.object');
 goog.require('webdriver.CommandName');
-goog.require('webdriver.Context');
 goog.require('webdriver.Future');
 goog.require('webdriver.Response');
+goog.require('webdriver.WebElement');
 goog.require('webdriver.timing');
 
 
@@ -57,11 +57,14 @@ webdriver.AbstractCommandProcessor.resolveFutureParams_ = function(
   function getValue(obj) {
     if (obj instanceof webdriver.Future) {
       return obj.getValue();
-    } else if (goog.isFunction(obj)) {
+    } else if (goog.isFunction(obj) ||
+               obj instanceof webdriver.WebElement) {
       return obj;
     } else if (goog.isObject(obj)) {
       goog.object.forEach(obj, function(value, key) {
-        obj[key] = getValue(value);
+        if (value instanceof webdriver.Future) {
+          obj[key] = value.getValue();
+        }
       });
     }
     return obj;
@@ -80,36 +83,41 @@ webdriver.AbstractCommandProcessor.resolveFutureParams_ = function(
 /**
  * Executes a command.
  * @param {webdriver.Command} command The command to execute.
- * @param {string} sessionId The current session ID.
- * @param {webdriver.Context} context The context to execute the command in.
  */
-webdriver.AbstractCommandProcessor.prototype.execute = function(command,
-                                                                sessionId,
-                                                                context) {
+webdriver.AbstractCommandProcessor.prototype.execute = function(command) {
+  var driver = command.getDriver();
   webdriver.AbstractCommandProcessor.resolveFutureParams_(command);
-  switch (command.name) {
+  var parameters = command.getParameters();
+  switch (command.getName()) {
     case webdriver.CommandName.SLEEP:
-      var ms = command.parameters[0];
+      var ms = parameters[0];
       webdriver.timing.setTimeout(function() {
-        command.setResponse(new webdriver.Response(false, context, ms));
+        command.setResponse(new webdriver.Response(
+            false, driver.getContext(), ms));
       }, ms);
       break;
 
     case webdriver.CommandName.WAIT:
     case webdriver.CommandName.FUNCTION:
       try {
-        var result = command.parameters[0]();
-        command.setResponse(new webdriver.Response(false, context, result));
+        var fn = parameters[0];
+        var selfObj = parameters[1];
+        var args = parameters[2];
+        var result = fn.apply(selfObj, args);
+        command.setResponse(new webdriver.Response(
+            false, driver.getContext(), result));
       } catch (ex) {
-        command.setResponse(new webdriver.Response(true, context, null, ex));
+        command.setResponse(new webdriver.Response(
+            true, driver.getContext(), null, ex));
       }
       break;
 
     default:
       try {
-        this.executeDriverCommand(command, sessionId, context);
+        this.dispatchDriverCommand(command);
       } catch (ex) {
-        command.setResponse(new webdriver.Response(true, context, null, ex));
+        command.setResponse(new webdriver.Response(
+            true, driver.getContext(), null, ex));
       }
       break;
   }
@@ -120,9 +128,7 @@ webdriver.AbstractCommandProcessor.prototype.execute = function(command,
  * Sends a command to be executed by a browser driver. This method must be
  * implemented by each subclass.
  * @param {webdriver.Command} command The command to execute.
- * @param {string} sessionId The current session ID.
- * @param {webdriver.Context} context The context to execute the command in.
  * @protected
  */
-webdriver.AbstractCommandProcessor.prototype.executeDriverCommand =
+webdriver.AbstractCommandProcessor.prototype.dispatchDriverCommand =
     goog.abstractMethod;

data/common/src/js/command.js

@@ -79,24 +79,6 @@ webdriver.Command = function(driver, name, opt_element) {
    */
   this.parameters = [];
 
-  /**
-   * Callback for when the command processor successfully finishes this command.
-   * The result of this function is included in the final result of the command.
-   * @type {?function}
-   */
-  this.onSuccessCallbackFn = null;
-  
-  /**
-   * Callback for when the command processor fails to successfully finish a
-   * command. The function should take a single argument, the
-   * {@code webdriver.Response} from the command processor. The response may be
-   * modified (for example, to turn an expect failure into a success). If the
-   * error state is cleared, the {@code onSucessCallbackFn} will still not be
-   * called.
-   * @type {?function}
-   */
-  this.onFailureCallbackFn = null;
-
   /**
    * The response to this command.
    * @type {?webdriver.Response}
@@ -123,8 +105,6 @@ webdriver.Command.prototype.disposeInternal = function() {
   delete this.name;
   delete this.element;
   delete this.parameters;
-  delete this.onSuccessCallbackFn;
-  delete this.onFailureCallbackFn;
   delete this.response;
 };
 
@@ -180,35 +160,10 @@ webdriver.Command.prototype.setParameters = function(var_args) {
 
 
 /**
- * Set the function to call with the {@code webdriver.Response} when the
- * command processor successfully runs this command. This function is considered
- * part of the command and any errors will cause the command as a whole to fail.
- * @param {function} callbackFn The function to call on success.
- * @param {Object} opt_selfObj The object in whose context to execute the
- *     function.
+ * @return {Array.<*>} The parameters to send with this command.
  */
-webdriver.Command.prototype.setSuccessCallback = function(callbackFn,
-                                                          opt_selfObj) {
-  if (callbackFn) {
-    this.onSuccessCallbackFn = goog.bind(callbackFn, opt_selfObj);
-  }
-  return this;
-};
-
-
-/**
- * Set the function to call with the {@code webdriver.Response} when the
- * command processor encounters an error while executing this command.
- * @param {function} callbackFn The function to call on failure.
- * @param {Object} opt_selfObj The object in whose context to execute the
- *     function.
- */
-webdriver.Command.prototype.setFailureCallback = function(callbackFn,
-                                                          opt_selfObj) {
-  if (callbackFn) {
-    this.onFailureCallbackFn = goog.bind(callbackFn, opt_selfObj);
-  }
-  return this;
+webdriver.Command.prototype.getParameters = function() {
+  return this.parameters;
 };
 
 
@@ -231,26 +186,7 @@ webdriver.Command.prototype.setResponse = function(response) {
     return;
   }
   this.response = response;
-
-  var sandbox = goog.bind(function(fn) {
-    try {
-      fn.call(this, this.response);
-    } catch (ex) {
-      this.response.isFailure = true;
-      this.response.errors.push(ex);
-    }
-  }, this);
-
-  if (!this.response.errors.length) {
-    if (this.response.isFailure &&
-        goog.isFunction(this.onFailureCallbackFn)) {
-      sandbox(this.onFailureCallbackFn);
-    } else if (!this.response.isFailure &&
-               goog.isFunction(this.onSuccessCallbackFn)) {
-      sandbox(this.onSuccessCallbackFn);
-    }
-  }
-
+  this.driver_.setContext(this.response.context);
   if (!this.response.isFailure) {
     this.futureResult_.setValue(this.response.value);
   } else {

data/common/src/js/future.js

@@ -116,7 +116,11 @@ webdriver.Future.prototype.setValue = function(value) {
   }
   if (value instanceof webdriver.Future) {
     if (value.isSet()) {
-      this.value_ = value.getValue();
+      value = value.getValue();
+      this.value_ = value;
+      goog.array.forEach(this.linkedFutures_, function(future) {
+        future.setValue(value);
+      });
     } else {
       value.linkedFutures_.push(this);
     }

data/common/src/js/jsunit.js

@@ -0,0 +1,40 @@
+/** @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 File to include for turnning any HTML page into a WebDriver
+ * JSUnit test suite by configuring an onload listener to the body that will
+ * instantiate and start the test runner.
+ */
+
+goog.provide('webdriver.jsunit');
+
+goog.require('goog.testing.jsunit');
+goog.require('webdriver.TestCase');
+goog.require('webdriver.asserts');
+goog.require('webdriver.factory');
+
+
+(function() {
+  window.onload = function() {
+    var test = new webdriver.TestCase(document.title,
+        webdriver.factory.createLocalWebDriver);
+    test.autoDiscoverTests();
+    G_testRunner.initialize(test);
+    G_testRunner.execute(test);
+  };
+})();

data/common/src/js/localcommandprocessor.js

@@ -24,6 +24,7 @@ limitations under the License.
 goog.provide('webdriver.LocalCommandProcessor');
 
 goog.require('goog.array');
+goog.require('goog.debug.Logger');
 goog.require('goog.dom');
 goog.require('goog.events');
 goog.require('goog.json');
@@ -123,9 +124,8 @@ webdriver.LocalCommandProcessor.onResponse_ = function(command, e) {
   }
 
   var rawResponse = goog.json.parse(jsonResponse);
-  webdriver.logging.info(
-      'receiving:\n' +
-      webdriver.logging.describe(rawResponse, '  '));
+  goog.debug.Logger.getLogger('webdriver.LocalCommandProcessor').fine(
+      'receiving:\n' + jsonResponse);
 
   var response = new webdriver.Response(
       rawResponse['isError'],
@@ -144,29 +144,34 @@ webdriver.LocalCommandProcessor.onResponse_ = function(command, e) {
 /**
  * @override
  */
-webdriver.LocalCommandProcessor.prototype.executeDriverCommand = function(
-    command, sessionId, context) {
-  if (command.name == webdriver.CommandName.SEND_KEYS) {
-    command.parameters = [command.parameters.join('')];
+webdriver.LocalCommandProcessor.prototype.dispatchDriverCommand = function(
+    command) {
+  if (command.getName() == webdriver.CommandName.SEND_KEYS) {
+    command.setParameters(command.getParameters().join(''));
   }
 
   var jsonCommand = {
-    'commandName': command.name,
-    'context': context.toString(),
-    'parameters': command.parameters
+    'commandName': command.getName(),
+    'context': command.getDriver().getContext().toString(),
+    'parameters': command.getParameters()
   };
 
   if (command.element) {
-    jsonCommand['elementId'] = command.element.getId().getValue();
+    try {
+      jsonCommand['elementId'] = command.element.getId().getValue();
+    } catch (ex) {
+      window.console.dir(command);
+      throw ex;
+    }
   }
 
-  webdriver.logging.info(
-      'sending:\n' +
-      webdriver.logging.describe(jsonCommand, '  '));
+  jsonCommand = goog.json.serialize(jsonCommand);
+  goog.debug.Logger.getLogger('webdriver.LocalCommandProcessor').fine(
+      'sending:\n' + jsonCommand);
 
   this.documentElement_.setAttribute(
       webdriver.LocalCommandProcessor.MessageAttribute_.COMMAND,
-      goog.json.serialize(jsonCommand));
+      jsonCommand);
 
   goog.events.listen(this.documentElement_,
       webdriver.LocalCommandProcessor.EventType_.RESPONSE,