selenium-webdriver 0.0.7 → 0.0.8

data/common/src/js/webelement.js

@@ -23,8 +23,6 @@ limitations under the License.
 goog.provide('webdriver.WebElement');
 
 goog.require('goog.array');
-goog.require('goog.math.Coordinate');
-goog.require('goog.math.Size');
 goog.require('webdriver.By.Locator');
 goog.require('webdriver.By.Strategy');
 goog.require('webdriver.Command');
@@ -90,12 +88,9 @@ webdriver.WebElement.UUID_REGEX =
 webdriver.WebElement.findElement = function(driver, locator) {
   var webElement = new webdriver.WebElement(driver);
   locator = webdriver.By.Locator.checkLocator(locator);
-  var command = new webdriver.Command(webdriver.CommandName.FIND_ELEMENT).
-      setParameters(locator.type, locator.target).
-      setSuccessCallback(function(response) {
-        webElement.getId().setValue(response.value);
-      });
-  driver.addCommand(command);
+  var command = driver.addCommand(webdriver.CommandName.FIND_ELEMENT).
+      setParameters(locator.type, locator.target);
+  webElement.getId().setValue(command.getFutureResult());
   return webElement;
 };
 
@@ -113,20 +108,18 @@ webdriver.WebElement.findElement = function(driver, locator) {
  * @see webdriver.By.Locator.createFromObj
  */
 webdriver.WebElement.isElementPresent = function(driver, locator) {
-  var isPresent = new webdriver.Future(driver);
   var callback = function(response) {
     // If returns without an error, element is present.
-    isPresent.setValue(response.value = !response.isFailure);
+    response.value = !response.isFailure;
     // Go ahead and clear the error.
     response.isFailure = false;
   };
   locator = webdriver.By.Locator.checkLocator(locator);
-  var command = new webdriver.Command(webdriver.CommandName.FIND_ELEMENT).
+  return driver.addCommand(webdriver.CommandName.FIND_ELEMENT).
       setParameters(locator.type, locator.target).
       setSuccessCallback(callback).
-      setFailureCallback(callback);
-  driver.addCommand(command);
-  return isPresent;
+      setFailureCallback(callback).
+      getFutureResult();
 };
 
 
@@ -141,12 +134,11 @@ webdriver.WebElement.isElementPresent = function(driver, locator) {
  */
 webdriver.WebElement.findElements = function(driver, locator) {
   locator = webdriver.By.Locator.checkLocator(locator);
-  var command = new webdriver.Command(webdriver.CommandName.FIND_ELEMENTS).
+  driver.addCommand(webdriver.CommandName.FIND_ELEMENTS).
       setParameters(locator.type, locator.target).
       setSuccessCallback(function(response) {
-        var ids = response.value.split(',');
         var elements = [];
-        for (var i = 0, id; id = ids[i]; i++) {
+        for (var i = 0, id; id = response.value[i]; i++) {
           if (id) {
             var element = new webdriver.WebElement(driver);
             element.getId().setValue(id);
@@ -155,7 +147,6 @@ webdriver.WebElement.findElements = function(driver, locator) {
         }
         response.value = elements;
       });
-  driver.addCommand(command);
 };
 
 
@@ -171,24 +162,22 @@ webdriver.WebElement.findElements = function(driver, locator) {
  * @see webdriver.By.Locator.createFromObj
  */
 webdriver.WebElement.prototype.isElementPresent = function(locator) {
-  var isPresent = new webdriver.Future(this.driver_);
   var callback = function(response) {
     // If returns without an error, element is present.
-    isPresent.setValue(response.value = !response.isFailure);
+    response.value = !response.isFailure;
     // Go ahead and clear the error (if any).
     response.isFailure = false;
   };
   locator = webdriver.By.Locator.checkLocator(locator);
-  var command = new webdriver.Command(webdriver.CommandName.FIND_CHILD_ELEMENT).
+  return this.driver_.addCommand(webdriver.CommandName.FIND_CHILD_ELEMENT).
       setParameters({
         'id': this.getId(),
         'using': locator.type,
         'value': locator.target
       }).
       setSuccessCallback(callback).
-      setFailureCallback(callback);
-  this.driver_.addCommand(command);
-  return isPresent;
+      setFailureCallback(callback).
+      getFutureResult();
 };
 
 
@@ -206,16 +195,14 @@ webdriver.WebElement.prototype.isElementPresent = function(locator) {
 webdriver.WebElement.prototype.findElement = function(locator) {
   var webElement = new webdriver.WebElement(this.driver_);
   locator = webdriver.By.Locator.checkLocator(locator);
-  var command = new webdriver.Command(webdriver.CommandName.FIND_CHILD_ELEMENT).
+  var command = this.driver_.
+      addCommand(webdriver.CommandName.FIND_CHILD_ELEMENT).
       setParameters({
         'id': this.getId(),
         'using': locator.type,
         'value': locator.target
-      }).
-      setSuccessCallback(function(response) {
-        webElement.getId().setValue(response.value);
       });
-  this.driver_.addCommand(command);
+  webElement.getId().setValue(command.getFutureResult());
   return webElement;
 };
 
@@ -230,26 +217,23 @@ webdriver.WebElement.prototype.findElement = function(locator) {
  */
 webdriver.WebElement.prototype.findElements = function(locator) {
   locator = webdriver.By.Locator.checkLocator(locator);
-  var command =
-      new webdriver.Command(webdriver.CommandName.FIND_CHILD_ELEMENTS).
-          setParameters({
-            'id': this.getId(),
-            'using': locator.type,
-            'value': locator.target
-          }).
-          setSuccessCallback(function(response) {
-            var ids = response.value.split(',');
-            var elements = [];
-            for (var i = 0, id; id = ids[i]; i++) {
-              if (id) {
-                var element = new webdriver.WebElement(this.driver_);
-                element.getId().setValue(id);
-                elements.push(element);
-              }
-            }
-            response.value = elements;
-          }, this);
-  this.driver_.addCommand(command);
+  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);
+          }
+        }
+        response.value = elements;
+      }, this);
 };
 
 
@@ -278,7 +262,7 @@ webdriver.WebElement.prototype.getId = function() {
  * @private
  */
 webdriver.WebElement.prototype.createCommand_ = function(name) {
-  return new webdriver.Command(name, this);
+  return this.driver_.addCommand(name, this);
 };
 
 
@@ -286,8 +270,7 @@ webdriver.WebElement.prototype.createCommand_ = function(name) {
  * Adds a command to click on this element.
  */
 webdriver.WebElement.prototype.click = function() {
-  var command = this.createCommand_(webdriver.CommandName.CLICK);
-  this.driver_.addCommand(command);
+  this.createCommand_(webdriver.CommandName.CLICK);
 };
 
 
@@ -343,18 +326,14 @@ webdriver.WebElement.prototype.click = function() {
 webdriver.WebElement.prototype.sendKeys = function(var_args) {
   var command = this.createCommand_(webdriver.CommandName.SEND_KEYS);
   command.setParameters.apply(command, arguments);
-  this.driver_.addCommand(command);
 };
 
 /**
  * Queries for the tag/node name of this element.
  */
 webdriver.WebElement.prototype.getTagName = function() {
-  var name = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.GET_TAG_NAME).
-      setSuccessCallback(name.setValueFromResponse, name);
-  this.driver_.addCommand(command);
-  return name;
+  return this.createCommand_(webdriver.CommandName.GET_TAG_NAME).
+      getFutureResult();
 };
 
 
@@ -371,12 +350,9 @@ webdriver.WebElement.prototype.getTagName = function() {
  *    Future.
  */
 webdriver.WebElement.prototype.getComputedStyle = function(cssStyleProperty) {
-  var value = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.GET_VALUE_OF_CSS_PROPERTY).
+  return this.createCommand_(webdriver.CommandName.GET_VALUE_OF_CSS_PROPERTY).
       setParameters(cssStyleProperty).
-      setSuccessCallback(value.setValueFromResponse, value);
-  this.driver_.addCommand(command);
-  return value;
+      getFutureResult();
 };
 
 
@@ -385,22 +361,9 @@ webdriver.WebElement.prototype.getComputedStyle = function(cssStyleProperty) {
  * @param {string} attributeName The name of the attribute to query.
  */
 webdriver.WebElement.prototype.getAttribute = function(attributeName) {
-  var value = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.GET_ATTRIBUTE).
+  return this.createCommand_(webdriver.CommandName.GET_ATTRIBUTE).
       setParameters(attributeName).
-      setSuccessCallback(value.setValueFromResponse, value).
-      // If there is an error b/c the attribute was not found, set value to null
-      setFailureCallback(function(response) {
-        // TODO(jmleyba): This error message needs to be consistent for all
-        // drivers.
-        if (response.value == 'No match') {
-          response.isFailure = false;
-          response.value = null;
-          value.setValue(null);
-        }
-      });
-  this.driver_.addCommand(command);
-  return value;
+      getFutureResult();
 };
 
 
@@ -409,11 +372,8 @@ webdriver.WebElement.prototype.getAttribute = function(attributeName) {
  *    this instance.
  */
 webdriver.WebElement.prototype.getValue = function() {
-  var value = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.GET_VALUE).
-      setSuccessCallback(value.setValueFromResponse, value);
-  this.driver_.addCommand(command);
-  return value;
+  return this.createCommand_(webdriver.CommandName.GET_VALUE).
+      getFutureResult();
 };
 
 
@@ -422,11 +382,8 @@ webdriver.WebElement.prototype.getValue = function() {
  *     or trailing whitespace.
  */
 webdriver.WebElement.prototype.getText = function() {
-  var text = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.GET_TEXT).
-      setSuccessCallback(text.setValueFromResponse, text);
-  this.driver_.addCommand(command);
-  return text;
+  return this.createCommand_(webdriver.CommandName.GET_TEXT).
+      getFutureResult();
 };
 
 
@@ -434,8 +391,7 @@ webdriver.WebElement.prototype.getText = function() {
  * Selects this element.
  */
 webdriver.WebElement.prototype.setSelected = function() {
-  var command = this.createCommand_(webdriver.CommandName.SET_SELECTED);
-  this.driver_.addCommand(command);
+  this.createCommand_(webdriver.CommandName.SET_SELECTED);
 };
 
 
@@ -443,31 +399,8 @@ webdriver.WebElement.prototype.setSelected = function() {
  * @return {webdriver.Future} The size of this element.
  */
 webdriver.WebElement.prototype.getSize = function() {
-  var size = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.GET_SIZE).
-      setSuccessCallback(function(response) {
-        var wh = response.value.replace(/\s/g, '').split(',');
-        response.value = new goog.math.Size(wh[0], wh[1]);
-        size.setValue(response.value);
-      });
-  this.driver_.addCommand(command);
-  return size;
-};
-
-
-/**
- * Parses a response of the form "$x $y" into a {@code goog.math.Coordinate}
- * object.
- * @param {webdriver.Future} future The Future to store the parsed result in.
- * @param {webdriver.Response} response The response to parse.
- * @private
- */
-webdriver.WebElement.createCoordinatesFromResponse_ = function(future,
-                                                               response) {
-  var xy = response.value.replace(/\s/g, '').split(',');
-  response.value = new goog.math.Coordinate(
-      Number(xy[0]), Number(xy[1]));
-  future.setValue(response.value);
+  return this.createCommand_(webdriver.CommandName.GET_SIZE).
+      getFutureResult();
 };
 
 
@@ -475,32 +408,8 @@ webdriver.WebElement.createCoordinatesFromResponse_ = function(future,
  * @return {webdriver.Future} The location of this element.
  */
 webdriver.WebElement.prototype.getLocation = function() {
-  var currentLocation = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.GET_LOCATION).
-      setSuccessCallback(
-          goog.bind(webdriver.WebElement.createCoordinatesFromResponse_, null,
-              currentLocation));
-  this.driver_.addCommand(command);
-  return currentLocation;
-};
-
-
-/**
- * @param {webdriver.Future} newLocation Future to store the new location in
- *     when the command is complete.
- * @param {number} x Horizontal distance to drag this element.
- * @param {number} y Vertical distanct to drag this element.
- * @param opt_addToFront
- * @private
- */
-webdriver.WebElement.prototype.addDragAndDropCommand_ = function(
-    newLocation, x, y, opt_addToFront) {
-  var command = this.createCommand_(webdriver.CommandName.DRAG_ELEMENT).
-      setParameters(x, y).
-      setSuccessCallback(
-          goog.bind(webdriver.WebElement.createCoordinatesFromResponse_, null,
-              newLocation));
-  this.driver_.addCommand(command, opt_addToFront);
+  return this.createCommand_(webdriver.CommandName.GET_LOCATION).
+      getFutureResult();
 };
 
 
@@ -511,9 +420,9 @@ webdriver.WebElement.prototype.addDragAndDropCommand_ = function(
  * @return {webdriver.Future} The new location of the element.
  */
 webdriver.WebElement.prototype.dragAndDropBy = function(x, y) {
-  var newLocation = new webdriver.Future(this.driver_);
-  this.addDragAndDropCommand_(newLocation, x, y);
-  return newLocation;
+  return this.createCommand_(webdriver.CommandName.DRAG_ELEMENT).
+      setParameters(x, y).
+      getFutureResult();
 };
 
 
@@ -532,13 +441,11 @@ webdriver.WebElement.prototype.dragAndDropTo = function(webElement) {
 
   var toLocation = webElement.getLocation();
   var thisLocation = this.getLocation();
-  var newLocation = new webdriver.Future(this.driver_);
-  this.driver_.callFunction(goog.bind(function() {
+  return this.driver_.callFunction(function() {
     var delta = goog.math.Coordinate.difference(
         toLocation.getValue(), thisLocation.getValue());
-    this.addDragAndDropCommand_(newLocation, delta.x, delta.y, true);
-  }, this));
-  return newLocation;
+    return this.dragAndDropBy(delta.x, delta.y);
+  }, this);
 };
 
 
@@ -547,15 +454,12 @@ webdriver.WebElement.prototype.dragAndDropTo = function(webElement) {
  *     enabled, as dictated by the {@code disabled} attribute.
  */
 webdriver.WebElement.prototype.isEnabled = function() {
-  var futureValue = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.GET_ATTRIBUTE).
+  return this.createCommand_(webdriver.CommandName.GET_ATTRIBUTE).
       setParameters('disabled').
       setSuccessCallback(function(response) {
         response.value = !!!response.value;
-        futureValue.setValue(response.value);
-      });
-  this.driver_.addCommand(command);
-  return futureValue;
+      }).
+      getFutureResult();
 };
 
 
@@ -563,27 +467,17 @@ webdriver.WebElement.prototype.isEnabled = function() {
  * Determines if this element is checked or selected; will generate an error if
  * the DOM element represented by this instance is not an OPTION or checkbox
  * INPUT element.
- * @return {webdriver.Future} Whether this instance is currently checked or
- *    selected.
+ * @return {webdriver.Future} Whether this element is checked or selected.
  * @private
  */
-webdriver.WebElement.prototype.isCheckedOrSelected_ = function(opt_future,
-                                                               opt_addToFront) {
-  var value = opt_future ||  new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.GET_TAG_NAME).
-      setSuccessCallback(function(response) {
-        var attribute = response.value == 'input' ? 'checked' : 'selected';
-        var getAttrCommand =
-            this.createCommand_(webdriver.CommandName.GET_ATTRIBUTE).
-                setParameters(attribute).
-                setSuccessCallback(function(response) {
-                  response.value = !!response.value;
-                  value.setValue(response.value);
-                });
-        this.driver_.addCommand(getAttrCommand, true);
-      }, this);
-  this.driver_.addCommand(command, opt_addToFront);
-  return value;
+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.getAttribute(attribute);
+    }, this);
+  }, this);
 };
 
 
@@ -610,13 +504,10 @@ webdriver.WebElement.prototype.isChecked = function() {
  * @return {webdriver.Future} The new checked/selected state of this element.
  */
 webdriver.WebElement.prototype.toggle = function() {
-  var toggleResult = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.TOGGLE).
-      setSuccessCallback(function() {
-        this.isCheckedOrSelected_(toggleResult, true);
-      }, this);
-  this.driver_.addCommand(command);
-  return toggleResult;
+  return this.driver_.callFunction(function() {
+    this.createCommand_(webdriver.CommandName.TOGGLE);
+    return this.driver_.callFunction(this.isCheckedOrSelected_, this);
+  }, this);
 };
 
 
@@ -625,8 +516,7 @@ webdriver.WebElement.prototype.toggle = function() {
  * will that form.
  */
 webdriver.WebElement.prototype.submit = function() {
-  this.driver_.addCommand(
-      this.createCommand_(webdriver.CommandName.SUBMIT));
+  this.createCommand_(webdriver.CommandName.SUBMIT);
 };
 
 
@@ -635,8 +525,7 @@ webdriver.WebElement.prototype.submit = function() {
  * will clear its {@code value}.
  */
 webdriver.WebElement.prototype.clear = function() {
-  this.driver_.addCommand(
-      this.createCommand_(webdriver.CommandName.CLEAR));
+  this.createCommand_(webdriver.CommandName.CLEAR);
 };
 
 
@@ -644,18 +533,8 @@ webdriver.WebElement.prototype.clear = function() {
  * @return {webdriver.Future} Whether this element is currently displayed.
  */
 webdriver.WebElement.prototype.isDisplayed = function() {
-  var futureValue = new webdriver.Future(this.driver_);
-  var command = this.createCommand_(webdriver.CommandName.IS_DISPLAYED).
-      setSuccessCallback(function(response) {
-        // TODO(jmleyba): FF extension should not be returning a string here...
-        if (goog.isString(response.value)) {
-          futureValue.setValue(response.value == 'true');
-        } else {
-          futureValue.setValue(response.value);
-        }
-      });
-  this.driver_.addCommand(command);
-  return futureValue;
+  return this.createCommand_(webdriver.CommandName.IS_DISPLAYED).
+      getFutureResult();
 };