fix(findElements): Consistently include evaluate.

When using findElements with a css locator, wrap the returned list of
elements with protractor specific functionality.

Author: Jeremy Morony & Clark Cutler

lib/protractor.js

@@ -152,10 +152,15 @@ Protractor.prototype.wrapWebElement = function(element) {
    */
   element.findElement = function(locator, varArgs) {
     thisPtor.waitForAngular();
+
+    var found;
     if (locator.findOverride) {
-      return locator.findOverride(element.getDriver(), element);
+      found = locator.findOverride(element.getDriver(), element);
+    } else {
+      found = originalFindElement.apply(element, arguments);
     }
-    return originalFindElement.apply(element, arguments);
+
+    return thisPtor.wrapWebElement(found);
   };
 
   /**
@@ -165,10 +170,21 @@ Protractor.prototype.wrapWebElement = function(element) {
    */
   element.findElements = function(locator, varArgs) {
     thisPtor.waitForAngular();
+
+    var found;
     if (locator.findArrayOverride) {
-      return locator.findArrayOverride(element.getDriver(), element);
+      found = locator.findArrayOverride(element.getDriver(), element);
+    } else {
+      found = originalFindElements.apply(element, arguments);
     }
-    return originalFindElements.apply(element, arguments);
+
+    return found.then(function(elems) {
+      for (var i = 0; i < elems.length; ++i) {
+        thisPtor.wrapWebElement(elems[i]);
+      }
+
+      return elems;
+    });
   }
 
   /**
@@ -212,11 +228,16 @@ Protractor.prototype.wrapWebElement = function(element) {
  * @return {!webdriver.WebElement}
  */
 Protractor.prototype.findElement = function(locator, varArgs) {
+  var found;
   this.waitForAngular();
+
   if (locator.findOverride) {
-    return this.wrapWebElement(locator.findOverride(this.driver));
+    found = locator.findOverride(this.driver);
+  } else {
+    found = this.driver.findElement(locator, varArgs);
   }
-  return this.wrapWebElement(this.driver.findElement(locator, varArgs));
+
+  return this.wrapWebElement(found);
 };
 
 /**
@@ -226,17 +247,22 @@ Protractor.prototype.findElement = function(locator, varArgs) {
  *     array of the located {@link webdriver.WebElement}s.
  */
 Protractor.prototype.findElements = function(locator, varArgs) {
-  var self = this;
+  var self = this, found;
   this.waitForAngular();
+
   if (locator.findArrayOverride) {
-    return locator.findArrayOverride(this.driver).then(function(elems) {
-      for (var i = 0; i < elems.length; ++i) {
-        self.wrapWebElement(elems[i]);
-      }
-      return elems;
-    });
+    found = locator.findArrayOverride(this.driver);
+  } else {
+    found = this.driver.findElements(locator, varArgs);
   }
-  return this.driver.findElements(locator, varArgs);
+
+  return found.then(function(elems) {
+    for (var i = 0; i < elems.length; ++i) {
+      self.wrapWebElement(elems[i]);
+    }
+
+    return elems;
+  });
 };
 
 /**

spec/findelements_spec.js

@@ -278,5 +278,95 @@ describe('finding elements', function() {
       // Make sure it works with a promise expectation.
       expect(element.evaluate('planet.radius')).toEqual(1516);
     });
+
+    describe('when wrapping all elements', function() {
+      describe('when querying using a locator that specifies an override', function() {
+        it('should wrap the results', function() {
+          ptor.findElements(protractor.By.binding('planet.name')).then(function(elements) {
+            for (var i = 0; i < elements.length; i++) {
+              expect(typeof elements[i].evaluate).toBe('function');
+            }
+          });
+        });
+      });
+
+      describe('when querying using a locator that does not specify an override', function() {
+        it('should wrap the results', function() {
+          ptor.findElements(protractor.By.css('option[value="4"]')).then(function(elements) {
+            for (var i = 0; i < elements.length; i++) {
+              expect(typeof elements[i].evaluate).toBe('function');
+            }
+          });
+        });
+      });
+    });
+
+    describe('when querying against a found element', function() {
+      var info;
+
+      beforeEach(function() {
+        info = ptor.findElement(protractor.By.css('.planet-info'));
+      });
+
+      describe('when querying for a single element', function() {
+        describe('when ng using a locator that specifies an override', function() {
+          var planetName;
+
+          beforeEach(function() {
+            planetName = info.findElement(protractor.By.binding('planet.name'));
+          });
+
+          it('should wrap the result', function() {
+            expect(typeof planetName.evaluate).toBe("function")
+          });
+        });
+
+        describe('when querying using a locator that does not specify an override', function() {
+          var moons;
+
+          beforeEach(function() {
+            moons = info.findElement(protractor.By.css('div:last-child'));
+          });
+
+          it('should wrap the result', function() {
+            expect(typeof moons.evaluate).toBe("function")
+          });
+        });
+      });
+
+      describe('when querying for many elements', function() {
+        describe('when using a locator that specifies an override', function() {
+          var planetName;
+
+          beforeEach(function() {
+            planetName = info.findElements(protractor.By.binding('planet.name'));
+          });
+
+          it('should wrap the result', function() {
+            planetName.then(function(result) {
+              for (var i = 0; i < result.length; ++i) {
+                expect(typeof result[i].evaluate).toBe("function");
+              }
+            });
+          });
+        });
+
+        describe('when querying using a locator that does not specify an override', function() {
+          var moons;
+
+          beforeEach(function() {
+            moons = info.findElements(protractor.By.css('div:last-child'));
+          });
+
+          it('should wrap the result', function() {
+            moons.then(function(result) {
+              for (var i = 0; i < result.length; ++i) {
+                expect(typeof result[i].evaluate).toBe("function");
+              }
+            });
+          });
+        });
+      });
+    });
   });
 });

testapp/app/partials/bindings.html

@@ -5,7 +5,7 @@
 <div>Details for:
   <select ng-model="planet" ng-options="planet.name for planet in planets">
 </select>
-<div>
+<div class="planet-info">
   <div>{{planet.name}}</div>
   <div>Radius: {{getRadiusKm()}}km</div>
   <div>Moons: <span ng-repeat="moon in planet.moons">{{moon}}</span></div>