Moving the 'evaluate' script into clientSideScripts.

Author: juliemr

Diff for: lib/clientsidescripts.js

@@ -284,7 +284,7 @@ clientSideScripts.findSelectedOption = function() {
  *
  * arguments none.
  */
- clientSideScripts.testForAngular = function() {
+clientSideScripts.testForAngular = function() {
   var attempts = arguments[0];
   var callback = arguments[arguments.length - 1];
   var check = function(n) {
@@ -298,3 +298,18 @@ clientSideScripts.findSelectedOption = function() {
   };
   check(attempts);
 };
+
+/**
+ * Evalute an Angular expression in the context of a given element.
+ *
+ * arguments[0] {Element} The element in whose scope to evaluate.
+ * arguments[1] {string} The expression to evaluate.
+ *
+ * @return {?Object} The result of the evaluation.
+ */
+clientSideScripts.evaluate = function() {
+  var element = arguments[0];
+  var expression = arguments[1];
+
+  return angular.element(element).scope().$eval(expression);
+};

Diff for: lib/protractor.js

@@ -174,19 +174,14 @@ Protractor.prototype.wrapWebElement = function(element) {
    *
    * @return {!webdriver.promise.Promise} A promise that will resolve to the
    *     evaluated expression. The result will be resolved as in
-   *     webdriver.WebDriver.executeScript. In summary - primitives will be
-   *     resolved as is, functions will be converted to string, and elements
+   *     {@link webdriver.WebDriver.executeScript}. In summary - primitives will
+   *     be resolved as is, functions will be converted to string, and elements
    *     will be returned as a WebElement.
    */
   element.evaluate = function(expression) {
-    // TODO: put into clientSideScripts
     thisPtor.waitForAngular();
-    return element.getDriver().executeScript(function() {
-      var element = arguments[0];
-      var expression = arguments[1];
-
-      return angular.element(element).scope().$eval(expression)
-    }, element, expression);
+    return element.getDriver().executeScript(clientSideScripts.evaluate,
+        element, expression);
   };
 
   return element;