diff --git a/lib/debugger/debuggerCommons.js b/lib/debugger/debuggerCommons.js index 29cbf341f..2f9f948ab 100644 --- a/lib/debugger/debuggerCommons.js +++ b/lib/debugger/debuggerCommons.js @@ -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() { diff --git a/lib/driverProviders/direct.js b/lib/driverProviders/direct.js index bfa06e163..6f1ff71c4 100644 --- a/lib/driverProviders/direct.js +++ b/lib/driverProviders/direct.js @@ -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': diff --git a/lib/protractor.js b/lib/protractor.js index c3b45e2c0..a942294c3 100644 --- a/lib/protractor.js +++ b/lib/protractor.js @@ -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_( diff --git a/package.json b/package.json index 1b1829031..e35e59c9a 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,10 @@ "author": "Julie Ralph ", "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",