Skip to content

Commit c3aca2b

Browse files
committed
fix(isElementPresent): for un-wrapped WebElements, browser.isElementPresent was broken
Closes angular#3864
1 parent 24ae714 commit c3aca2b

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

lib/browser.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -589,10 +589,16 @@ export class ProtractorBrowser extends Webdriver {
589589
* @returns {!webdriver.promise.Promise} A promise that will resolve to whether
590590
* the element is present on the page.
591591
*/
592-
isElementPresent(locatorOrElement: ProtractorBy|WebElement): wdpromise.Promise<any> {
593-
let element =
594-
((locatorOrElement as any).isPresent) ? locatorOrElement : this.element(locatorOrElement);
595-
return (element as any).isPresent();
592+
isElementPresent(locatorOrElement: Locator|WebElement): wdpromise.Promise<any> {
593+
let element: ElementFinder;
594+
if ((locatorOrElement as any).isPresent) {
595+
element = locatorOrElement as ElementFinder;
596+
} else if (locatorOrElement instanceof WebElement) {
597+
element = ElementFinder.fromWebElement_(this, locatorOrElement);
598+
} else {
599+
element = this.element(locatorOrElement);
600+
}
601+
return element.isPresent();
596602
}
597603

598604
/**

lib/element.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ export class ElementFinder extends WebdriverWebElement {
846846
}
847847
[key: string]: any;
848848

849-
static fromWebElement_(browser: ProtractorBrowser, webElem: WebElement, locator: Locator):
849+
static fromWebElement_(browser: ProtractorBrowser, webElem: WebElement, locator?: Locator):
850850
ElementFinder {
851851
let getWebElements = () => {
852852
return wdpromise.fulfilled([webElem]);

0 commit comments

Comments
 (0)