selenium-webdriver 0.0.7 → 0.0.8

data/chrome/src/extension/background.js

@@ -348,7 +348,7 @@ function sendResponseToParsedRequest(toSend, wait) {
   ChromeDriver.lastRequestToBeSentWhichHasntBeenAnsweredYet = null;
   console.log("SENDING RESPOND TO PARSED REQUEST");
   sendResponseByXHR(JSON.stringify(toSend), wait);
-  setToolstripsBusy(false);
+  setExtensionBusyIndicator(false);
 }
 
 /**
@@ -387,7 +387,7 @@ function parseRequest(request) {
     return;
   }
   ChromeDriver.isBlockedWaitingForResponse = true;
-  setToolstripsBusy(true);
+  setExtensionBusyIndicator(true);
   
   switch (request.request) {
   case "get":
@@ -429,6 +429,9 @@ function parseRequest(request) {
       }, false);
     }
     break;
+  case "screenshot":
+    getScreenshot();
+    break;
   case "clickElement":
   case "hoverOverElement":
     // Falling through, as native events are handled the same
@@ -486,6 +489,19 @@ function parseRequest(request) {
   }
 }
 
+function getScreenshot() {
+  chrome.tabs.captureVisibleTab(null, getScreenshotResult);
+}
+
+function getScreenshotResult(snapshotDataUrl) {
+  var index = snapshotDataUrl.indexOf('base64,');
+  if (index == -1) {
+    sendResponseToParsedRequest({statusCode: 99}, false);
+    return;
+  }
+  var base64 = snapshotDataUrl.substring(index + 'base64,'.length);
+  sendResponseToParsedRequest({statusCode: 0, value: base64}, false);
+}
 
 function sendMessageOnActivePortAndAlsoKeepTrackOfIt(message) {
   ChromeDriver.lastRequestToBeSentWhichHasntBeenAnsweredYet = message.request;
@@ -889,23 +905,12 @@ function sendEmptyResponseWhenTabIsLoaded(tab) {
 }
       
 
-function setToolstripsBusy(busy) {
-  var toolstrips = chrome.extension.getToolstrips(ChromeDriver.activeWindowId);
+function setExtensionBusyIndicator(busy) {
   if (busy) {
     chrome.browserAction.setIcon({path: "icons/busy.png"})
   } else {
     chrome.browserAction.setIcon({path: "icons/free.png"})
   }
-  for (var toolstrip in toolstrips) {
-    if (toolstrips[toolstrip].setWebdriverToolstripBusy && 
-        toolstrips[toolstrip].setWebdriverToolstripFree) {
-      if (busy) {
-        toolstrips[toolstrip].setWebdriverToolstripBusy();
-      } else {
-        toolstrips[toolstrip].setWebdriverToolstripFree();
-      }
-    }
-  }
 }
 
 function setActivePortByWindowName(handle) {

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

@@ -2,7 +2,6 @@
   "name": "WebDriver",
   "version": "0.3",
   "description": "WebDriver extension for Chrome",
-  "toolstrips": ["toolstrip.html"],
   "browser_action": {
     "default_title": "WebDriver",
     "default_icon": "icons/free.png"
@@ -12,7 +11,7 @@
     {
       "matches": ["http://*/*", "https://*/*", "file:///*"],
       "js": ["utils.js", "content_script.js"],
-      "run_at": "document_start"
+      "run_at": "document_end"
     }
   ],
   "permissions": ["http://*/*", "tabs"]

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

@@ -2,7 +2,6 @@
   "name": "WebDriver",
   "version": "0.2",
   "description": "WebDriver extension for Chrome",
-  "toolstrips": ["toolstrip.html"],
   "browser_action": {
     "default_title": "WebDriver",
     "default_icon": "icons/free.png"
@@ -12,7 +11,7 @@
     {
       "matches": ["http://*/*", "https://*/*", "file:///*"],
       "js": ["utils.js", "content_script.js"],
-      "run_at": "document_start"
+      "run_at": "document_end"
     }
   ],
   "plugins": [{"path": "npchromedriver.dll", "public": true}],

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

@@ -17,7 +17,7 @@ module Selenium
         end
 
         def driver_extensions
-          []
+          [DriverExtensions::TakesScreenshot]
         end
 
         def get(url)
@@ -73,6 +73,10 @@ module Selenium
           execute :request => 'getCurrentWindowHandle'
         end
 
+        def getScreenshotAsBase64
+          execute :request => "screenshot"
+        end
+
         def setSpeed(value)
           @speed = value
         end

data/common/src/js/abstractcommandprocessor.js

@@ -96,10 +96,6 @@ webdriver.AbstractCommandProcessor.prototype.execute = function(command,
       break;
 
     case webdriver.CommandName.WAIT:
-      var callback = goog.bind(this.waitCallback_, this, command, context);
-      command.parameters[0].start(callback);
-      break;
-
     case webdriver.CommandName.FUNCTION:
       try {
         var result = command.parameters[0]();
@@ -120,35 +116,6 @@ webdriver.AbstractCommandProcessor.prototype.execute = function(command,
 };
 
 
-/**
- * Callback for {@code webdriver.CommandName.WAIT} commands.
- * @param {webdriver.Command} command The wait command.
- * @param {webdriver.Context} context The context the command executed in.
- * @param {boolean} isTimeout Whether the wait finished from a timeout.
- * @param {number} elapsedTime The amount of time spent waiting, in
- *     milliseconds.
- * @param {Error} opt_ex If defined, an error that caused the wait to terminate
- *     early.
- */
-webdriver.AbstractCommandProcessor.prototype.waitCallback_ = function(
-    command, context, isTimeout, elapsedTime, opt_ex) {
-  var message;
-  if (opt_ex) {
-    message = 'Error';
-  } else if (isTimeout) {
-    message = 'Timeout';
-  } else {
-    message = 'Ready';
-  }
-  var response = new webdriver.Response(isTimeout || opt_ex, context,
-      message + ' after ' + elapsedTime + 'ms');
-  if (opt_ex) {
-    response.errors.push(opt_ex);
-  }
-  command.setResponse(response);
-};
-
-
 /**
  * Sends a command to be executed by a browser driver. This method must be
  * implemented by each subclass.

data/common/src/js/asserts.js

@@ -164,7 +164,7 @@ webdriver.asserts.Matcher.isTheSameLocationAs = function(expected) {
       function () {
         return 'equal ' + webdriver.asserts.objToString(expected);
       });
-}
+};
 goog.exportSymbol('isTheSameLocationAs',
                   webdriver.asserts.Matcher.isTheSameLocationAs);
 
@@ -200,7 +200,7 @@ webdriver.asserts.assertThat = function(a, b, opt_c) {
           'Expected to ' + matcher.describe() +
           '\n  but was ' + webdriver.asserts.objToString(future));
     }
-  }
+  };
 
   if (future instanceof webdriver.Future) {
     // Schedule a function with the Future's controlling driver so the value

data/common/src/js/by.js

@@ -25,6 +25,8 @@ goog.provide('webdriver.By.Locator');
 goog.provide('webdriver.By.Strategy');
 
 goog.require('goog.object');
+goog.require('goog.string');
+
 
 
 /**

data/common/src/js/command.js

@@ -25,22 +25,44 @@ goog.provide('webdriver.CommandName');
 goog.provide('webdriver.Response');
 
 goog.require('goog.array');
+goog.require('goog.events.EventTarget');
+goog.require('goog.testing.stacktrace');
+goog.require('webdriver.Future');
 
 
 /**
  * Describes a command to be executed by a
  * {@code webdriver.AbstractCommandProcessor}.
- * @param {string} name The name of this command.
- * @param {webdriver.WebElement} opt_element The element to perform this command
- *     on. If not defined, the command will be performed relative to the
- *     document root.
+ * @param {webdriver.WebDriver} driver The driver that this is a command for.
+ * @param {webdriver.CommandName} name The name of this command.
+ * @param {webdriver.WebElement} opt_element The element to perform this
+ *     command on. If not defined, the command will be performed relative to
+ *     the document root.
  * @constructor
+ * @extends {goog.events.EventTarget}
  */
-webdriver.Command = function(name, opt_element) {
+webdriver.Command = function(driver, name, opt_element) {
+  goog.events.EventTarget.call(this);
+
+  /**
+   * The driver that this is a command to.
+   * @type {webdriver.WebDriver}
+   * @private
+   */
+  this.driver_ = driver;
+
+  /**
+   * A future that will be automatically updated with the value of this
+   * command's response when it is ready. If the command fails, the
+   * future's value will not be set.
+   * @type {webdriver.Future}
+   * @private
+   */
+  this.futureResult_ = new webdriver.Future(this.driver_);
 
   /**
    * The name of this command.
-   * @type {string}
+   * @type {webdriver.CommandName}
    */
   this.name = name;
 
@@ -75,26 +97,74 @@ webdriver.Command = function(name, opt_element) {
    */
   this.onFailureCallbackFn = null;
 
-  /**
-   * Callback for when this command is completely finished, which is after the
-   * response is set and success/failure callbacks have been run. The function
-   * should take a single argument, a reference to this command.
-   * @type {?function}
-   * @private
-   */
-  this.onCompleteCallbackFn_ = null;
-
   /**
    * The response to this command.
-   * @type {webdriver.Response}
+   * @type {?webdriver.Response}
    */
   this.response = null;
 
-  /**
-   * Whether this command was aborted.
-   * @type {boolean}
-   */
-  this.abort = false;
+};
+goog.inherits(webdriver.Command, goog.events.EventTarget);
+
+
+/**
+ * The event dispatched by a command when it fails.
+ * @type {string}
+ */
+webdriver.Command.ERROR_EVENT = 'ERROR';
+
+
+/** @override */
+webdriver.Command.prototype.disposeInternal = function() {
+  webdriver.Command.superClass_.disposeInternal.call(this);
+  this.futureResult_.dispose();
+  delete this.driver_;
+  delete this.futureResult_;
+  delete this.name;
+  delete this.element;
+  delete this.parameters;
+  delete this.onSuccessCallbackFn;
+  delete this.onFailureCallbackFn;
+  delete this.response;
+};
+
+
+/** @override */
+webdriver.Command.prototype.toString = function() {
+  return this.name;
+};
+
+
+/**
+ * @return {webdriver.WebDriver} The driver that this is a command to.
+ */
+webdriver.Command.prototype.getDriver = function() {
+  return this.driver_;
+};
+
+
+/**
+ * @return {webdriver.CommandName} This command's name.
+ */
+webdriver.Command.prototype.getName = function() {
+  return this.name;
+};
+
+
+/**
+ * @return {webdriver.Future} The future result (value-only) of this command.
+ */
+webdriver.Command.prototype.getFutureResult = function() {
+  return this.futureResult_;
+};
+
+
+/**
+ * @return {boolean} Whether this command has finished; aborted commands are
+ *     never considered finished.
+ */
+webdriver.Command.prototype.isFinished = function() {
+  return !!this.response;
 };
 
 
@@ -143,17 +213,10 @@ webdriver.Command.prototype.setFailureCallback = function(callbackFn,
 
 
 /**
- * Set the function to call with this command when it is completed.
- * @param {function} callbackFn The function to call on command completion.
- * @param {Object} opt_selfObj The object in whose context to execute the
- *     function.
+ * @return {?webdriver.Response} The response to this command if it is ready.
  */
-webdriver.Command.prototype.setCompleteCallback = function(callbackFn,
-                                                           opt_selfObj) {
-  if (callbackFn) {
-    this.onCompleteCallbackFn_ = goog.bind(callbackFn, opt_selfObj);
-  }
-  return this;
+webdriver.Command.prototype.getResponse = function() {
+  return this.response;
 };
 
 
@@ -164,7 +227,7 @@ webdriver.Command.prototype.setCompleteCallback = function(callbackFn,
  * @throws If the response was already set.
  */
 webdriver.Command.prototype.setResponse = function(response) {
-  if (this.response) {
+  if (this.isDisposed() || this.isFinished()) {
     return;
   }
   this.response = response;
@@ -188,8 +251,10 @@ webdriver.Command.prototype.setResponse = function(response) {
     }
   }
 
-  if (this.onCompleteCallbackFn_) {
-    this.onCompleteCallbackFn_(this);
+  if (!this.response.isFailure) {
+    this.futureResult_.setValue(this.response.value);
+  } else {
+    this.dispatchEvent(webdriver.Command.ERROR_EVENT);
   }
 };
 
@@ -259,7 +324,7 @@ webdriver.CommandName = {
  *     {@code true}, then {@code value} contains the error message.
  * @param {webdriver.Context} context The (potentially new) context resulting
  *     from the command.
- * @param {string} value The value of the response, the meaning of which depends
+ * @param {*} value The value of the response, the meaning of which depends
  *     on the command.
  * @parma {Error} opt_error An error that caused this command to fail
  *     prematurely.
@@ -270,5 +335,34 @@ webdriver.Response = function(isFailure, context, value, opt_error) {
   this.context = context;
   this.value = value;
   this.errors = goog.array.slice(arguments, 3);
-  this.extraData = {};
+};
+
+
+/**
+ * @return {?string} A formatted error message, or {@code null} if this is not a
+ *     failure response.
+ */
+webdriver.Response.prototype.getErrorMessage = function() {
+  if (!this.isFailure) {
+    return null;
+  }
+  var message = [];
+  if (goog.isString(this.value)) {
+    message.push(this.value);
+  } else if (null != this.value && goog.isDef(this.value.message)) {
+    message.push(this.value.message);
+    if (goog.isDef(this.value.fileName)) {
+      message.push(this.value.fileName + '@' + this.value.lineNumber);
+    }
+  }
+  goog.array.extend(message, goog.array.map(this.errors, function(error) {
+    if (goog.isString(error)) {
+      return error;
+    }
+    var errMsg = error.message || error.description || error.toString();
+    var stack = error.stack ?
+        goog.testing.stacktrace.canonicalize(error.stack) : error['stackTrace'];
+    return errMsg + '\n' + stack;
+  }));
+  return message.join('\n');
 };

data/common/src/js/future.js

@@ -23,24 +23,20 @@ limitations under the License.
 
 goog.provide('webdriver.Future');
 
-goog.require('goog.events.EventType');
-goog.require('goog.events.EventTarget');
+goog.require('goog.Disposable');
+goog.require('goog.array');
 
 
 /**
  * Represents the result of an asynchronous {@code webdriver.Command}. Methods
  * are provided to check if the result has been set and to retrieve the result.
- * <p/>
- * This instance will dispatch a {@code goog.events.EventType.CHANGE} event when
- * its value is set. An {@code Error} will be thrown if {@code #getValue()} is
- * called before the value has been set.
  * @param {webdriver.WebDriver} driver The WebDriver instance that will
  *     eventually set this instance's value.
  * @constructor
- * @extends {goog.events.EventTarget}
+ * @extends {goog.Disposable}
  */
 webdriver.Future = function(driver) {
-  goog.events.EventTarget.call(this);
+  goog.Disposable.call(this);
 
   /**
    * The WebDriver that will eventaully set this instance's value.
@@ -55,8 +51,16 @@ webdriver.Future = function(driver) {
    * @private
    */
   this.value_ = webdriver.Future.NOT_SET_;
+
+  /**
+   * Futures whose values are linked to this one. When this future's value is
+   * set, all of the linked futures will also be updated.
+   * @type {Array.<webdriver.Future>}
+   * @private
+   */
+  this.linkedFutures_ = [];
 };
-goog.inherits(webdriver.Future,  goog.events.EventTarget);
+goog.inherits(webdriver.Future,  goog.Disposable);
 
 
 /**
@@ -68,6 +72,15 @@ goog.inherits(webdriver.Future,  goog.events.EventTarget);
 webdriver.Future.NOT_SET_ = {};
 
 
+/** @override */
+webdriver.Future.prototype.disposeInternal = function() {
+  delete this.driver_;
+  delete this.value_;
+  delete this.linkedFutures_;
+  webdriver.Future.superClass_.disposeInternal.call(this);
+};
+
+
 /**
  * @return {*} The value of this Future.
  * @throws If the value has not been set yet.
@@ -90,23 +103,29 @@ webdriver.Future.prototype.getDriver = function() {
 
 
 /**
- * Sets the value of this Future. Dispatches a
- * {@code goog.events.EventType.CHANGE} event.
+ * Sets the value of this Future and dispatches a
+ * {@code goog.events.EventType.CHANGE} event. If the given value is another
+ * future and its value has not been set, a callback will be registered to
+ * set this instance's value when the input future's value is set. Note that
+ * the value of a future may only be set once.
  * @param {*} value The new value.
  */
 webdriver.Future.prototype.setValue = function(value) {
-  this.value_ = value;
-  this.dispatchEvent(goog.events.EventType.CHANGE);
-};
-
-
-/**
- * Sets the value of this future from the value of a Response object.
- * @param {webdriver.Response} response The webdriver.Response to set the value
- *     from.
- */
-webdriver.Future.prototype.setValueFromResponse = function(response) {
-  this.setValue(response.value);
+  if (this.isSet()) {
+    return;
+  }
+  if (value instanceof webdriver.Future) {
+    if (value.isSet()) {
+      this.value_ = value.getValue();
+    } else {
+      value.linkedFutures_.push(this);
+    }
+  } else {
+    this.value_ = value;
+    goog.array.forEach(this.linkedFutures_, function(future) {
+      future.setValue(value);
+    });
+  }
 };