Skip to content

Commit

Permalink
fix(pageload): Changing how about:blank unload waits
Browse files Browse the repository at this point in the history
Also changing `executeScript` script comment from `//` to `/**/`
format. These two small changes should not affect functionality but
make Protractor work with Selendroid.
  • Loading branch information
samuelhorwitz authored and juliemr committed Apr 3, 2014
1 parent 439ed45 commit 43aff83
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/protractor.js
Expand Up @@ -866,7 +866,7 @@ Protractor.prototype.get = function(destination, opt_timeout) {
// At this point, we need to make sure the new url has loaded before
// we try to execute any asynchronous scripts.
this.driver.wait(function() {
return self.driver.getCurrentUrl().then(function(url) {
return self.driver.executeScript('return window.location.href;').then(function(url) {
return url !== 'about:blank';
});
}, timeout * 1000, 'Timed out waiting for page to load');
Expand Down Expand Up @@ -899,7 +899,7 @@ Protractor.prototype.get = function(destination, opt_timeout) {
}

return this.driver.executeScript(function() {
// Continue to bootstrap Angular.
/* Continue to bootstrap Angular. */
angular.resumeBootstrap(arguments[0]);
}, this.moduleNames_);
};
Expand Down

0 comments on commit 43aff83

Please sign in to comment.