From 555ec46be30dba3bfbaf3ac79d676ccc375eb912 Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Tue, 12 Apr 2016 18:42:27 -0700
Subject: [PATCH] docs(e2e): workaround comp-comm interval timer tests closes
 #1081 Note how `browser.get('?e2e')` enables app to know it is running under
 protractor

---
 .../cb-component-communication/e2e-spec.js    | 23 ++++++++++--------
 .../ts/app/app.component.ts                   | 24 ++++++++++++-------
 public/docs/_examples/protractor.config.js    |  1 +
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/public/docs/_examples/cb-component-communication/e2e-spec.js b/public/docs/_examples/cb-component-communication/e2e-spec.js
index 37d97f4bd5..ed00a5c7cb 100644
--- a/public/docs/_examples/cb-component-communication/e2e-spec.js
+++ b/public/docs/_examples/cb-component-communication/e2e-spec.js
@@ -1,8 +1,9 @@
 describe('Component Communication Cookbook Tests', function () {
 
-
+  // Note: '?e2e' which app can read to know it is running in protractor
+  // e.g. `if (!/e2e/.test(location.search)) { ...`
   beforeAll(function () {
-    browser.get('');
+    browser.get('?e2e');
   });
 
   describe('Parent-to-child communication', function() {
@@ -149,17 +150,19 @@ describe('Component Communication Cookbook Tests', function () {
     // ...
     // #enddocregion child-to-parent
   });
-  
-  describe('Parent calls child via local var', function() {
+
+  // Can't run timer tests in protractor because
+  // interaction w/ zones causes all tests to freeze & timeout.
+  xdescribe('Parent calls child via local var', function() {
     countDownTimerTests('countdown-parent-lv')
-  });    
-  
-  describe('Parent calls ViewChild', function() {
+  });
+
+  xdescribe('Parent calls ViewChild', function() {
     countDownTimerTests('countdown-parent-vc')
   });
- 
+
   function countDownTimerTests(parentTag) {
-    // #docregion countdown-timer-tests    
+    // #docregion countdown-timer-tests
     // ...
     it('timer and parent seconds should match', function () {
       var parent = element(by.tagName(parentTag));
@@ -179,7 +182,7 @@ describe('Component Communication Cookbook Tests', function () {
       });
     });
     // ...
-    // #enddocregion countdown-timer-tests    
+    // #enddocregion countdown-timer-tests
   }
 
 
diff --git a/public/docs/_examples/cb-component-communication/ts/app/app.component.ts b/public/docs/_examples/cb-component-communication/ts/app/app.component.ts
index 1cb24ac989..6034b8e28f 100644
--- a/public/docs/_examples/cb-component-communication/ts/app/app.component.ts
+++ b/public/docs/_examples/cb-component-communication/ts/app/app.component.ts
@@ -7,17 +7,25 @@ import {CountdownLocalVarParentComponent,
         CountdownViewChildParentComponent} from './countdown-parent.component';
 import {MissionControlComponent} from './missioncontrol.component';
 
-@Component({
-  selector: 'app',
-  templateUrl: 'app/app.component.html',
-  directives: [
+let directives: any[] = [
     HeroParentComponent,
     NameParentComponent,
     VersionParentComponent,
     VoteTakerComponent,
-    CountdownLocalVarParentComponent,
-    CountdownViewChildParentComponent,
-    MissionControlComponent
-  ]
+    MissionControlComponent,
+  ];
+
+// Include Countdown examples
+// unless in e2e tests which they break.
+if (!/e2e/.test(location.search)) {
+  console.log('adding countdown timer examples')
+  directives.push(CountdownLocalVarParentComponent);
+  directives.push(CountdownViewChildParentComponent);
+}
+
+@Component({
+  selector: 'app',
+  templateUrl: 'app/app.component.html',
+  directives: directives
 })
 export class AppComponent { }
diff --git a/public/docs/_examples/protractor.config.js b/public/docs/_examples/protractor.config.js
index 47484d7028..18406b3682 100644
--- a/public/docs/_examples/protractor.config.js
+++ b/public/docs/_examples/protractor.config.js
@@ -28,6 +28,7 @@ exports.config = {
   // For angular2 tests
   useAllAngular2AppRoots: true,
 
+  // Base URL for application server
   baseUrl: 'http://localhost:8080',
 
   // doesn't seem to work.