fix(blockingproxy): Start bpRunner strictly after setupDriverEnv

If local driver provider is used, `seleniumAddress` appears in config only after `setupDriverEnv()` is resolved.
angular · Jul 15, 2017 · ab1afb0 · ab1afb0
1 parent b85e7ee
commit ab1afb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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',