feat(hybrid): set ng12hybrid flag in the config

Author: sjelin

lib/browser.ts

@@ -252,7 +252,8 @@ export class ProtractorBrowser extends Webdriver {
 
   constructor(
       webdriverInstance: webdriver.WebDriver, opt_baseUrl?: string,
-      opt_rootElement?: string, opt_untrackOutstandingTimeouts?: boolean) {
+      opt_rootElement?: string, opt_untrackOutstandingTimeouts?: boolean,
+      opt_ng12Hybrid?: boolean) {
     super();
     // These functions should delegate to the webdriver instance, but should
     // wait for Angular to sync up before performing the action. This does not
@@ -286,7 +287,7 @@ export class ProtractorBrowser extends Webdriver {
     this.ready = null;
     this.plugins_ = new Plugins({});
     this.resetUrl = DEFAULT_RESET_URL;
-    this.ng12Hybrid = false;
+    this.ng12Hybrid = opt_ng12Hybrid;
 
     this.driver.getCapabilities().then((caps: webdriver.Capabilities) => {
       // Internet Explorer does not accept data URLs, which are the default
@@ -901,7 +902,8 @@ export class ProtractorBrowser extends Webdriver {
    * browser.get('http://angular.github.io/protractor/#/api');
    * expect(browser.getLocationAbsUrl())
    *     .toBe('http://angular.github.io/protractor/#/api');
-   * @returns {webdriver.promise.Promise<string>} The current absolute url from AngularJS.
+   * @returns {webdriver.promise.Promise<string>} The current absolute url from
+   * AngularJS.
    */
   getLocationAbsUrl(): webdriver.promise.Promise<any> {
     this.waitForAngular();
@@ -1236,15 +1238,20 @@ export class ProtractorBrowser extends Webdriver {
    * Create a new instance of Browser by wrapping a webdriver instance.
    *
    * @param {webdriver.WebDriver} webdriver The configured webdriver instance.
-   * @param {string=} opt_baseUrl A URL to prepend to relative gets.
-   * @param {boolean=} opt_untrackOutstandingTimeouts Whether Browser should
+   * @param {string=} baseUrl A URL to prepend to relative gets.
+   * @param {string=} rootElement The
+   * @param {boolean=} untrackOutstandingTimeouts Whether Browser should
    *     stop tracking outstanding $timeouts.
+   * @param {boolean=} ng12Hybrid Whether Browser should interpret any apps it
+   *     comes across as hybrid angular1/angular2 apps
    * @returns {Browser} a new Browser instance
    */
   static wrapDriver(
       webdriver: webdriver.WebDriver, baseUrl?: string, rootElement?: string,
-      untrackOutstandingTimeouts?: boolean): ProtractorBrowser {
+      untrackOutstandingTimeouts?: boolean,
+      ng12Hybrid?: boolean): ProtractorBrowser {
     return new ProtractorBrowser(
-        webdriver, baseUrl, rootElement, untrackOutstandingTimeouts);
+        webdriver, baseUrl, rootElement, untrackOutstandingTimeouts,
+        ng12Hybrid);
   }
 }

lib/config.ts

@@ -552,6 +552,15 @@ export interface Config {
      */
     disableEnvironmentOverrides?: boolean;
 
+    /**
+     * Tells Protractor to interpret any angular apps it comes across as hybrid
+     * angular1/angular2 apps (i.e. apps using ngUpgrade)
+     * Defaults to `false`
+     *
+     * @type {boolean}
+     */
+    ng12Hybrid?: boolean;
+
     seleniumArgs?: Array<any>;
     configDir?: string;
     troubleshoot?: boolean;

lib/configParser.ts

@@ -40,6 +40,7 @@ export class ConfigParser {
       noGlobals: false,
       plugins: [],
       skipSourceMapSupport: false,
+      ng12Hybrid: false
     };
   }
 

lib/runner.ts

@@ -199,7 +199,7 @@ export class Runner extends EventEmitter {
 
     var browser_ = ProtractorBrowser.wrapDriver(
         driver, config.baseUrl, config.rootElement,
-        config.untrackOutstandingTimeouts);
+        config.untrackOutstandingTimeouts, config.ng12Hybrid);
 
     browser_.params = config.params;
     if (plugins) {

spec/hybrid/async_spec.js

@@ -1,14 +1,10 @@
 describe('async angular2 application', function() {
   beforeEach(function() {
-    this.ng12Hybrid = true;
     browser.get('/hybrid');
   });
 
-  afterEach(function() {
-    this.ng12Hybrid = false;
-  });
-
-  it('should propertly load the page', function() {
+  it('should set browser flag via config', function() {
+    expect(browser.ng12Hybrid).toBe(true);
     expect($('h1').getText()).toEqual('My App');
   });
 
@@ -28,4 +24,10 @@ describe('async angular2 application', function() {
     ng1Btn.click();
     expect(ng1Btn.getText()).toEqual('Click Count: 1');
   });
+
+  it('should use the flag on the browser object', function() {
+    browser.ng12Hybrid = false;
+    browser.get('/ng2'); // will time out if Protractor expects hybrid
+    browser.ng12Hybrid = true;
+  });
 });

spec/hybridConf.js

@@ -14,5 +14,7 @@ exports.config = {
 
   baseUrl: env.baseUrl,
 
-  rootElement: 'body'
+  rootElement: 'body',
+
+  ng12Hybrid: true
 };