fix(isElementPresent): for un-wrapped WebElements, `browser.isEleme…

…ntPresent` was broken (#3871) Closes #3864
angular · Dec 22, 2016 · 1345137 · 1345137
1 parent 74e3bad
commit 1345137
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/browser.ts b/lib/browser.ts
@@ -589,10 +589,16 @@ export class ProtractorBrowser extends Webdriver {
    * @returns {!webdriver.promise.Promise} A promise that will resolve to whether
    *     the element is present on the page.
    */
-  isElementPresent(locatorOrElement: ProtractorBy|WebElement): wdpromise.Promise<any> {
-    let element =
-        ((locatorOrElement as any).isPresent) ? locatorOrElement : this.element(locatorOrElement);
-    return (element as any).isPresent();
+  isElementPresent(locatorOrElement: Locator|WebElement|ElementFinder): wdpromise.Promise<any> {
+    let element: ElementFinder;
+    if (locatorOrElement instanceof ElementFinder) {
+      element = locatorOrElement;
+    } else if (locatorOrElement instanceof WebElement) {
+      element = ElementFinder.fromWebElement_(this, locatorOrElement);
+    } else {
+      element = this.element(locatorOrElement);
+    }
+    return element.isPresent();
   }
 
   /**

diff --git a/lib/element.ts b/lib/element.ts
@@ -844,7 +844,7 @@ export class ElementFinder extends WebdriverWebElement {
     });
   }
 
-  static fromWebElement_(browser: ProtractorBrowser, webElem: WebElement, locator: Locator):
+  static fromWebElement_(browser: ProtractorBrowser, webElem: WebElement, locator?: Locator):
       ElementFinder {
     let getWebElements = () => {
       return wdpromise.fulfilled([webElem]);