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

Commit

Permalink
fix(Protractor.prototype.get): resolve baseUrl before ignoring sync…
Browse files Browse the repository at this point in the history
…hronization

Fixes issues where setting `ignoreSynchronization = true` ignores the value of `baseUrl` entirely.
  • Loading branch information
pkillian authored and juliemr committed Jan 22, 2014
1 parent 3151ca7 commit 8e096b9
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/protractor.js
Original file line number Diff line number Diff line change
Expand Up @@ -552,11 +552,12 @@ Protractor.prototype.clearMockModules = function() {
* @param {=number} opt_timeout Number of seconds to wait for Angular to start.
*/
Protractor.prototype.get = function(destination, opt_timeout) {
var timeout = opt_timeout || 10;
destination = url.resolve(this.baseUrl, destination);

if (this.ignoreSynchronization) {
return this.driver.get(destination);
}
var timeout = opt_timeout || 10;
destination = url.resolve(this.baseUrl, destination);

this.driver.get('about:blank');
this.driver.executeScript(
Expand Down

0 comments on commit 8e096b9

Please sign in to comment.