chore(blockingproxy): Allow using a pre-existing Blocking Proxy insta…

…nce (#3970)
angular · Jan 18, 2017 · 879aac6 · 879aac6
1 parent bf123ad
commit 879aac6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/lib/cli.ts b/lib/cli.ts
@@ -41,6 +41,7 @@ let allowedNames = [
   'seleniumSessionId',
   'webDriverProxy',
   'useBlockingProxy',
+  'blockingProxyUrl',
   'sauceUser',
   'sauceKey',
   'sauceAgent',

diff --git a/lib/config.ts b/lib/config.ts
@@ -104,6 +104,12 @@ export interface Config {
    */
   useBlockingProxy?: boolean;
 
+  /**
+   * If specified, Protractor will connect to the Blocking Proxy at the given
+   * url instead of starting it's own.
+   */
+  blockingProxyUrl?: string;
+
   // ---- 3. To use remote browsers via Sauce Labs -----------------------------
 
   /**

diff --git a/lib/driverProviders/driverProvider.ts b/lib/driverProviders/driverProvider.ts
@@ -31,6 +31,9 @@ export abstract class DriverProvider {
   }
 
   getBPUrl() {
+    if (this.config_.blockingProxyUrl) {
+      return this.config_.blockingProxyUrl;
+    }
     return `http://localhost:${this.bpRunner.port}`;
   }
 
@@ -105,7 +108,7 @@ export abstract class DriverProvider {
    */
   setupEnv(): q.Promise<any> {
     let driverPromise = this.setupDriverEnv();
-    if (this.config_.useBlockingProxy) {
+    if (this.config_.useBlockingProxy && !this.config_.blockingProxyUrl) {
       // TODO(heathkit): If set, pass the webDriverProxy to BP.
       return q.all([driverPromise, this.bpRunner.start()]);
     }