fix(blockingproxy): Start bpRunner strictly after setupDriverEnv

wncm · heathkit · commit ab1afb093107 · 2017-07-15T01:31:14.000-07:00
If local driver provider is used, `seleniumAddress` appears in
config only after `setupDriverEnv()` is resolved.
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',

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ export abstract class DriverProvider {`
`124`	`124`	`let driverPromise = this.setupDriverEnv();`
`125`	`125`	`if (this.config_.useBlockingProxy && !this.config_.blockingProxyUrl) {`
`126`	`126`	`// TODO(heathkit): If set, pass the webDriverProxy to BP.`
`127`		`- return q.all([driverPromise, this.bpRunner.start()]);`
	`127`	`+ return driverPromise.then(() => this.bpRunner.start());`
`128`	`128`	`}`
`129`	`129`	`return driverPromise;`
`130`	`130`	`};`