fix(element): element.all.get and element.all.first/last should wrap …

…web elements Closes #307
angular · Dec 2, 2013 · a2afb4d · a2afb4d
1 parent a69ebc3
commit a2afb4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/protractor.js b/lib/protractor.js
@@ -106,7 +106,7 @@ var buildElementHelper = function(ptor) {
       var id = ptor.findElements(locator).then(function(arr) {
         return arr[index];
       });
-      return new webdriver.WebElement(ptor.driver, id);
+      return ptor.wrapWebElement(new webdriver.WebElement(ptor.driver, id));
     };
 
     elementArrayFinder.first = function() {
@@ -116,14 +116,14 @@ var buildElementHelper = function(ptor) {
         }
         return arr[0];
       });
-      return new webdriver.WebElement(ptor.driver, id);
+      return ptor.wrapWebElement(new webdriver.WebElement(ptor.driver, id));
     };
 
     elementArrayFinder.last = function() {
       var id = ptor.findElements(locator).then(function(arr) {
         return arr[arr.length - 1];
       });
-      return new webdriver.WebElement(ptor.driver, id);
+      return ptor.wrapWebElement(new webdriver.WebElement(ptor.driver, id));
     };
 
     elementArrayFinder.then = function(fn) {

diff --git a/spec/basic/findelements_spec.js b/spec/basic/findelements_spec.js
@@ -464,6 +464,15 @@ describe('wrapping web driver elements', function() {
         element.all(by.binding('planet.name')).then(function(results) {
           results.forEach(verifyMethodsAdded);
         });
+        element.all(by.binding('planet.name')).get(0).then(function(elem) {
+          elem.verifyMethodsAdded;
+        });
+        element.all(by.binding('planet.name')).first().then(function(elem) {
+          elem.verifyMethodsAdded;
+        });
+        element.all(by.binding('planet.name')).last().then(function(elem) {
+          elem.verifyMethodsAdded;
+        });
         element.all(by.css('option[value="4"]')).then(function(results) {
           results.forEach(verifyMethodsAdded);
         });