Update with feedback.

lib/bpRunner.ts

@@ -4,7 +4,7 @@ import * as q from 'q';
 import {Config} from './config';
 import {Logger} from './logger';
 
-const BP_PATH = 'node_modules/blocking-proxy/built/lib/bin.js';
+const BP_PATH = require.resolve('blocking-proxy/built/lib/bin.js');
 
 let logger = new Logger('BlockingProxy');
 
@@ -59,4 +59,4 @@ export class BlockingProxyRunner {
       throw new Error('BlockingProxy not yet supported with directConnect!');
     }
   }
-}
+}

lib/browser.ts

@@ -193,12 +193,15 @@ export class ProtractorBrowser extends Webdriver {
    * tests to become flaky. This should be used only when necessary, such as
    * when a page continuously polls an API using $timeout.
    *
+   * This property is deprecated - please use waitForAngularEnabled instead.
+   *
+   * @deprecated
    * @type {boolean}
    */
   set ignoreSynchronization(value) {
     this.driver.controlFlow().execute(() => {
       if (this.bpClient) {
-        logger.info('Setting synchronization ' + value);
+        logger.debug('Setting waitForAngular' + value);
         this.bpClient.setSynchronization(!value);
       }
     }, `Set proxy synchronization to ${value}`);
@@ -350,6 +353,22 @@ export class ProtractorBrowser extends Webdriver {
     this.ExpectedConditions = new ProtractorExpectedConditions(this);
   }
 
+  /**
+   * If set to false, Protractor will not wait for Angular $http and $timeout
+   * tasks to complete before interacting with the browser. This can cause
+   * flaky tests, but should be used if, for instance, your app continuously
+   * polls an API with $timeout.
+   *
+   * Call waitForAngularEnabled() without passing a value to read the current
+   * state without changing it.
+   */
+  waitForAngularEnabled(enabled: boolean = null): boolean {
+    if (enabled != null) {
+      this.ignoreSynchronization = !enabled;
+    }
+    return !this.ignoreSynchronization;
+  }
+
   /**
    * Get the processed configuration object that is currently being run. This
    * will contain the specs and capabilities properties of the current runner

lib/config.ts

@@ -97,10 +97,10 @@ export interface Config {
 
   /**
    * If specified, connect to webdriver through a proxy that manages client-side
-   * synchronization. This option is intended for testing an  experimental feature
-   * and is not meant to be used by end users.
+   * synchronization. Blocking Proxy is an experimental feature and may change
+   * without notice.
    */
-  useBlockingProxy?: string;
+  useBlockingProxy?: boolean;
 
   // ---- 3. To use remote browsers via Sauce Labs -----------------------------
 

lib/driverProviders/README.md

@@ -11,7 +11,7 @@ Each file exports a function which takes in the configuration as a parameter and
  * @return {q.promise} A promise which will resolve when the environment is
  *     ready to test.
  */
-DriverProvider.prototype.setupEnv
+DriverProvider.prototype.setupDriverEnv
 
 /**
  * @return {Array.<webdriver.WebDriver>} Array of existing webdriver instances.
@@ -47,9 +47,9 @@ DriverProvider.prototype.updateJob
 Requirements
 ------------
 
- - `setupEnv` will be called before the test framework is loaded, so any
+ - `setupDriverEnv` will be called before the test framework is loaded, so any
  pre-work which might cause timeouts on the first test should be done there. 
- `getNewDriver` will be called once right after `setupEnv` to generate the
+ `getNewDriver` will be called once right after `setupDriverEnv` to generate the
  initial driver, and possibly during the middle of the test if users request
  additional browsers.
 

lib/driverProviders/driverProvider.ts

@@ -118,8 +118,7 @@ export abstract class DriverProvider {
    * Set up environment specific to a particular driver provider. Overridden
    * by each driver provider.
    */
-  protected abstract setupDriverEnv():
-      q.Promise<any>
+  protected abstract setupDriverEnv(): q.Promise<any>;
 
   /**
    * Teardown and destroy the environment and do any associated cleanup.

package.json

@@ -16,7 +16,7 @@
     "@types/q": "^0.0.32",
     "@types/selenium-webdriver": "~2.53.31",
     "adm-zip": "0.4.7",
-    "blocking-proxy": "^0.0.1",
+    "blocking-proxy": "0.0.2",
     "chalk": "^1.1.3",
     "glob": "^7.0.3",
     "jasmine": "2.4.1",

scripts/test.js

@@ -4,6 +4,7 @@ var Executor = require('./test/test_util').Executor;
 
 var passingTests = [
   'node built/cli.js spec/basicConf.js',
+  'node built/cli.js spec/basicConf.js --useBlockingProxy',
   'node built/cli.js spec/multiConf.js',
   'node built/cli.js spec/altRootConf.js',
   'node built/cli.js spec/onCleanUpAsyncReturnValueConf.js',

spec/basic/elements_spec.js

@@ -465,7 +465,7 @@ describe('ElementArrayFinder', function() {
     ]);
   });
 
-  fit('should map and resolve multiple promises', function() {
+  it('should map and resolve multiple promises', function() {
     browser.get('index.html#/form');
     var labels = element.all(by.css('#animals ul li')).map(function(elm) {
       return {

spec/basic/polling_spec.js

@@ -30,8 +30,32 @@ describe('synchronizing with pages that poll', function() {
     });
   });
 
+  it('avoids timeouts using waitForAngularEnabled', function() {
+    var startButton = element(by.id('pollstarter'));
+
+    var count = element(by.binding('count'));
+    expect(count.getText()).toEqual('0');
+
+    startButton.click();
+
+    // Turn this off to see timeouts.
+    browser.waitForAngularEnabled(false);
+
+    expect(browser.waitForAngularEnabled()).toBeFalsy();
+
+    count.getText().then(function(text) {
+        expect(text).toBeGreaterThan(-1);
+    });
+
+    browser.sleep(2000);
+
+    count.getText().then(function(text) {
+        expect(text).toBeGreaterThan(1);
+    });
+  });
+
   afterEach(function() {
-    // Remember to turn it off when you're done!
-    browser.ignoreSynchronization = false;
+    // Remember to turn it back on when you're done!
+    browser.waitForAngularEnabled(true);
   });
 });

spec/install/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "module": "commonjs",
     "moduleResolution": "node",
     "sourceMap": false,