Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

Commit 6aef0c5

Browse files
committed
chore(expectedConditions): update generic Function typings
- Use `() => Promise<boolean>` over `Function` typings. - Fix an ExpectedConditions test where it was set to a const. - Fix a TypeScript typing interface issue with RunResults in taskRunner. - Fix a browser call to use waitForAngularEnabled method over the private variable.
1 parent b2ceb36 commit 6aef0c5

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

lib/expectedConditions.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,11 @@ export class ProtractorExpectedConditions {
284284
return async(): Promise<boolean> => {
285285
const actualTitle = await this.browser.driver.getTitle();
286286
return actualTitle === title;
287+
<<<<<<< HEAD
287288
};
289+
=======
290+
}
291+
>>>>>>> chore(expectedConditions): update generic Function typings
288292
}
289293

290294
/**

0 commit comments

Comments
 (0)