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

Commit beb961d

Browse files
authored
chore(promises): move element wdpromise to native Promise (#5047)
1 parent 51cb087 commit beb961d

File tree

7 files changed

+169
-195
lines changed

7 files changed

+169
-195
lines changed

circle.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
name: Selenium Start
5353
background: true
5454
command: |
55+
./node_modules/webdriver-manager/bin/webdriver-manager update
5556
./node_modules/.bin/webdriver-manager-replacement update --gecko false
5657
./node_modules/.bin/webdriver-manager-replacement start --gecko false
5758

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ gulp.task('prepublish', function(done) {
112112

113113
gulp.task('pretest', function(done) {
114114
runSequence('checkVersion',
115-
['webdriver:update', 'jshint', 'tslint', 'format'], 'tsc', 'built:copy', 'tsc:spec', done);
115+
['webdriver:update', 'jshint', 'tslint', 'format'], 'tsc', 'built:copy', 'tsc:spec', done);
116116
});
117117

118118
gulp.task('default',['prepublish']);

lib/browser.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -818,13 +818,13 @@ export class ProtractorBrowser extends AbstractExtendedWebDriver {
818818
* @param {number=} opt_timeout Number of milliseconds to wait for Angular to
819819
* start.
820820
*/
821-
get(destination: string, timeout = this.getPageTimeout) {
821+
async get(destination: string, timeout = this.getPageTimeout) {
822822
destination = this.baseUrl.indexOf('file://') === 0 ? this.baseUrl + destination :
823823
url.resolve(this.baseUrl, destination);
824-
if (this.ignoreSynchronization) {
825-
return this.driver.get(destination)
826-
.then(() => this.driver.controlFlow().execute(() => this.plugins_.onPageLoad(this)))
827-
.then(() => null);
824+
if (!await this.waitForAngularEnabled()) {
825+
await this.driver.get(destination);
826+
await this.plugins_.onPageLoad(this);
827+
return;
828828
}
829829

830830
let msg = (str: string) => {

0 commit comments

Comments
 (0)