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

Commit

Permalink
fix(synchronizing): use the same control flow when ignoring sync
Browse files Browse the repository at this point in the history
Previously, the order of frames and tasks on the control flow was
different depending on `browser.ignoreSynchronization`. This fixes
the inconsistency by creating an empty task when ignoreSynchronization
is true.

Practically, this fixes the polling spec failing after the update
to selenium-webdriver@2.47.0.
  • Loading branch information
juliemr committed Sep 30, 2015
1 parent 9a202ab commit f034e01
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/protractor.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,9 @@ Protractor.prototype.waitForAngular = function(opt_description) {
var description = opt_description ? ' - ' + opt_description : '';
var self = this;
if (this.ignoreSynchronization) {
return webdriver.promise.fulfilled();
return self.driver.controlFlow().execute(function() {
return true;
}, 'Ignore Synchronization Protractor.waitForAngular()');
}

return this.executeAsyncScript_(
Expand Down

0 comments on commit f034e01

Please sign in to comment.