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

chore(dependencies): update selenium-webdriver to 2.47.1 #2559

Merged
merged 2 commits into from
Sep 30, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/debugger/debuggerCommons.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ exports.attachDebugger = function(pid, opt_port) {
client.setBreakpoint({
type: 'scriptRegExp',
target: '.*executors\.js', //jshint ignore:line
line: 37
line: 40
}, function() {
process.send('ready');
client.reqContinue(function() {
Expand Down
2 changes: 1 addition & 1 deletion lib/driverProviders/direct.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ DirectDriverProvider.prototype.getNewDriver = function() {
}

var service = new chrome.ServiceBuilder(chromeDriverFile).build();
driver = chrome.createDriver(
driver = new chrome.Driver(
new webdriver.Capabilities(this.config_.capabilities), service);
break;
case 'firefox':
Expand Down
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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"author": "Julie Ralph <[email protected]>",
"dependencies": {
"request": "~2.57.0",
"selenium-webdriver": "2.45.1",
"selenium-webdriver": "2.47.0",
"minijasminenode": "1.1.1",
"jasminewd": "1.1.0",
"jasminewd2": "0.0.5",
"jasminewd2": "0.0.6",
"jasmine": "2.3.2",
"saucelabs": "~1.0.1",
"glob": "~3.2",
Expand Down