From ab1afb093107f3a63f6e15f8f315e33576bb414d Mon Sep 17 00:00:00 2001 From: Sergey Gruntovsky Date: Thu, 29 Jun 2017 01:24:25 +0300 Subject: [PATCH] fix(blockingproxy): Start bpRunner strictly after setupDriverEnv If local driver provider is used, `seleniumAddress` appears in config only after `setupDriverEnv()` is resolved. --- lib/driverProviders/driverProvider.ts | 2 +- scripts/test.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/driverProviders/driverProvider.ts b/lib/driverProviders/driverProvider.ts index f6655946f..225c2ee44 100644 --- a/lib/driverProviders/driverProvider.ts +++ b/lib/driverProviders/driverProvider.ts @@ -124,7 +124,7 @@ export abstract class DriverProvider { let driverPromise = this.setupDriverEnv(); if (this.config_.useBlockingProxy && !this.config_.blockingProxyUrl) { // TODO(heathkit): If set, pass the webDriverProxy to BP. - return q.all([driverPromise, this.bpRunner.start()]); + return driverPromise.then(() => this.bpRunner.start()); } return driverPromise; }; diff --git a/scripts/test.js b/scripts/test.js index cac0c7be4..4d2be0d6e 100755 --- a/scripts/test.js +++ b/scripts/test.js @@ -32,6 +32,7 @@ var passingTests = [ 'node built/cli.js spec/directConnectConf.js', 'node built/cli.js spec/restartBrowserBetweenTestsConf.js', 'node built/cli.js spec/driverProviderLocalConf.js', + 'node built/cli.js spec/driverProviderLocalConf.js --useBlockingProxy', 'node built/cli.js spec/getCapabilitiesConf.js', 'node built/cli.js spec/controlLockConf.js', 'node built/cli.js spec/customFramework.js',