fix(locators): using $().$$() should return an ElementArrayFinder

Prior, $(foo).$$(bar) would return a promise which resolved to an array of
WebElements. This is unexpected, since $(foo).$(bar) returns an ElementFinder, and
element(by.css(foo)).element.all(by.css(bar)) returns an ElementArrayFinder.
Fixed so things are more consistent.

Closes #640

Author: juliemr

lib/protractor.js

@@ -106,7 +106,7 @@ var buildElementHelper = function(ptor, opt_usingChain) {
     var elementFinder = {};
 
     var webElementFns = WEB_ELEMENT_FUNCTIONS.concat(
-        ['findElements', 'isElementPresent', 'evaluate', '$$']);
+        ['findElements', 'isElementPresent', 'evaluate']);
     webElementFns.forEach(function(fnName) {
       elementFinder[fnName] = function() {
         var callerError = new Error();
@@ -220,6 +220,11 @@ var buildElementHelper = function(ptor, opt_usingChain) {
           webdriver.By.css(cssSelector));
     };
 
+    elementFinder.$$ = function(cssSelector) {
+      return buildElementHelper(ptor, usingChain).all(
+          webdriver.By.css(cssSelector));
+    };
+
     return elementFinder;
   };
 

spec/basic/findelements_spec.js

@@ -416,6 +416,11 @@ describe('chaining find elements', function() {
           });
     });
 
+  it('should chain element.all after element', function() {
+    expect(element(by.id('baz')).element.all(by.binding('item')).count()).
+        toEqual(2);
+  });
+
   it('should wait to grab multiple chained elements',
       function() {
     browser.driver.get('about:blank');
@@ -644,6 +649,16 @@ describe('shortcut css notation', function() {
       });
     });
   });
+
+  it('should chain $$ with $', function() {
+    var withoutShortcutCount =
+        element(by.css('select')).element.all(by.css('option')).then(function(options) {
+          return options.length;
+        });
+    var withShortcutCount = $('select').$$('option').count();
+
+    expect(withoutShortcutCount).toEqual(withShortcutCount);
+  });
 });
 
 describe('wrapping web driver elements', function() {