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

Commit 43aff83

Browse files
samuelhorwitzjuliemr
authored andcommitted
fix(pageload): Changing how about:blank unload waits
Also changing `executeScript` script comment from `//` to `/**/` format. These two small changes should not affect functionality but make Protractor work with Selendroid.
1 parent 439ed45 commit 43aff83

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/protractor.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ Protractor.prototype.get = function(destination, opt_timeout) {
866866
// At this point, we need to make sure the new url has loaded before
867867
// we try to execute any asynchronous scripts.
868868
this.driver.wait(function() {
869-
return self.driver.getCurrentUrl().then(function(url) {
869+
return self.driver.executeScript('return window.location.href;').then(function(url) {
870870
return url !== 'about:blank';
871871
});
872872
}, timeout * 1000, 'Timed out waiting for page to load');
@@ -899,7 +899,7 @@ Protractor.prototype.get = function(destination, opt_timeout) {
899899
}
900900

901901
return this.driver.executeScript(function() {
902-
// Continue to bootstrap Angular.
902+
/* Continue to bootstrap Angular. */
903903
angular.resumeBootstrap(arguments[0]);
904904
}, this.moduleNames_);
905905
};

0 commit comments

Comments
 (0)