From c5faf084b1ad16bda731140d91644487984e4600 Mon Sep 17 00:00:00 2001
From: Sammy Jelin <sjelin@gmail.com>
Date: Mon, 22 Aug 2016 12:07:19 -0700
Subject: [PATCH] feat(browser): auto-unwrap ElementFinder into WebElement for
 selenium funtions (#3471)

---
 lib/browser.ts         | 16 +++++++++++-----
 spec/basic/lib_spec.js |  6 ++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/browser.ts b/lib/browser.ts
index 7ed990c37..6383419d8 100644
--- a/lib/browser.ts
+++ b/lib/browser.ts
@@ -51,7 +51,8 @@ export class Webdriver {
 
 /**
  * Mix a function from one object onto another. The function will still be
- * called in the context of the original object.
+ * called in the context of the original object.  Any arguments of type
+ * `ElementFinder` will be unwrapped to their underlying `WebElement` instance
  *
  * @private
  * @param {Object} to
@@ -59,8 +60,13 @@ export class Webdriver {
  * @param {string} fnName
  * @param {function=} setupFn
  */
-function mixin(to: any, from: any, fnName: string, setupFn?: Function) {
+function ptorMixin(to: any, from: any, fnName: string, setupFn?: Function) {
   to[fnName] = function() {
+    for (var i = 0; i < arguments.length; i++) {
+      if (arguments[i] instanceof ElementFinder) {
+        arguments[i] = arguments[i].getWebElement();
+      }
+    }
     if (setupFn) {
       setupFn();
     }
@@ -265,11 +271,11 @@ export class ProtractorBrowser extends Webdriver {
         .forEach((method: string) => {
           if (!this[method] && typeof webdriverInstance[method] == 'function') {
             if (methodsToSync.indexOf(method) !== -1) {
-              mixin(
+              ptorMixin(
                   this, webdriverInstance, method,
                   this.waitForAngular.bind(this));
             } else {
-              mixin(this, webdriverInstance, method);
+              ptorMixin(this, webdriverInstance, method);
             }
           }
         });
@@ -863,7 +869,7 @@ export class ProtractorBrowser extends Webdriver {
    */
   navigate() {
     let nav = this.driver.navigate();
-    mixin(nav, this, 'refresh');
+    ptorMixin(nav, this, 'refresh');
     return nav;
   }
 
diff --git a/spec/basic/lib_spec.js b/spec/basic/lib_spec.js
index 8484fab19..76c7667c9 100644
--- a/spec/basic/lib_spec.js
+++ b/spec/basic/lib_spec.js
@@ -44,6 +44,12 @@ describe('protractor library', function() {
         expect(browser.driver.getCurrentUrl()).toMatch('#/form');
       });
 
+  it('should unwrap WebElements', function() {
+    browser.get('index.html');
+    var ptorEl = element(by.binding('greet'));
+    browser.executeScript('', ptorEl); // Will crash if element isn't unwrapped
+  });
+
   it('should have access to the processed config block', function() {
     function containsMatching(arr, string) {
       var contains = false;