re-enable upgrade-adapter and upgrade-phonecat-1 tests

public/docs/_examples/protractor-helpers.ts

@@ -1,3 +1,5 @@
+import { browser } from 'protractor';
+
 export var appLang = {
   appIsTs: false,
   appIsJs: false,
@@ -21,11 +23,10 @@ export function itIf(cond: boolean, name: string, func: (done: DoneFn) => void):
   }
 }
 
-  // TODO Jesus - figure out what's needed here for the new upgrade chapters
+// TODO Jesus - figure out what's needed here for the new upgrade chapters
 // Allow changing bootstrap mode to NG1 for upgrade tests
 export function setProtractorToNg1Mode(): void {
-  // browser.rootEl = 'body';
+  browser.rootEl = 'body';
-
   // let disableNgAnimate = function() {
   //   angular.module('disableNgAnimate', []).run(['$animate', function($animate: any) {
   //     $animate.enabled(false);

public/docs/_examples/upgrade-adapter/e2e-spec.ts

@@ -1,6 +1,7 @@
 'use strict'; // necessary for es6 output in node
 
 import { browser, element, by } from 'protractor';
+import { setProtractorToNg1Mode } from '../protractor-helpers';
 
 describe('Upgrade Tests', function () {
 
@@ -32,6 +33,7 @@ describe('Upgrade Tests', function () {
     beforeAll(function () {
       browser.get('/index-bootstrap.html');
       setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
     });
 
     it('bootstraps as expected', function () {
@@ -45,6 +47,7 @@ describe('Upgrade Tests', function () {
     beforeAll(function () {
       browser.get('/index-1-2-hybrid-bootstrap.html');
       setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
     });
 
     it('bootstraps as expected', function () {