From 850ac675ee08ea60980cf210436168f9e8502f8d Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@gmail.com>
Date: Fri, 24 Jun 2016 11:34:49 -0700
Subject: [PATCH] chore: update ng cli, make e2e run sucessfully

---
 e2e/components/button/button.e2e.ts  | 10 ++++-----
 package.json                         |  2 +-
 src/demo-app/button/button-demo.html | 30 +++++++++++++--------------
 src/demo-app/index.html              |  2 +-
 src/e2e-app/button/button-e2e.html   | 31 ++++++++++++++++++++++------
 src/e2e-app/index.html               |  2 +-
 test/protractor.conf.js              | 13 +++++-------
 7 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/e2e/components/button/button.e2e.ts b/e2e/components/button/button.e2e.ts
index 6862085cd7f..6d7a263d680 100644
--- a/e2e/components/button/button.e2e.ts
+++ b/e2e/components/button/button.e2e.ts
@@ -4,12 +4,12 @@ describe('button', function () {
       browser.get('/button');
     });
     it('should prevent click handlers from executing when disabled', function () {
-      element(by.id('testButton')).click();
-      expect(element(by.id('clickCounter')).getText()).toEqual('1');
+      element(by.id('test-button')).click();
+      expect(element(by.id('click-counter')).getText()).toEqual('1');
 
-      element(by.id('disableToggle')).click();
-      element(by.id('testButton')).click();
-      expect(element(by.id('clickCounter')).getText()).toEqual('1');
+      element(by.id('disable-toggle')).click();
+      element(by.id('test-button')).click();
+      expect(element(by.id('click-counter')).getText()).toEqual('1');
     });
   });
 });
diff --git a/package.json b/package.json
index 1c5a5fe7eeb..de194344931 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "add-stream": "^1.0.0",
-    "angular-cli": "^1.0.0-beta.5",
+    "angular-cli": "^1.0.0-beta.6",
     "broccoli-autoprefixer": "^4.1.0",
     "broccoli-funnel": "^1.0.1",
     "broccoli-merge-trees": "^1.1.1",
diff --git a/src/demo-app/button/button-demo.html b/src/demo-app/button/button-demo.html
index dab30c8c4bc..e8d9b17ae78 100644
--- a/src/demo-app/button/button-demo.html
+++ b/src/demo-app/button/button-demo.html
@@ -11,8 +11,8 @@
   </section>
 
   <section>
-    <a href="http://www.google.com" md-button color="primary">link</a>
-    <a href="http://www.google.com" md-raised-button>link</a>
+    <a href="http://www.google.com" md-button color="primary">SEARCH</a>
+    <a href="http://www.google.com" md-raised-button>SEARCH</a>
     <a href="http://www.google.com" md-fab>
       <md-icon class="md-24">check</md-icon>
     </a>
@@ -61,13 +61,15 @@
 
   <section>
     <div>
-      <p>isDisabled: {{isDisabled}}, clickCounter: <span id="clickCounter">{{clickCounter}}</span></p>
-      <button md-raised-button (click)="isDisabled=!isDisabled" id="disableToggle">Disable buttons</button>
-      <button md-raised-button (click)="button1.focus()" id="disableToggle">Focus 1</button>
-      <button md-raised-button (click)="button2.focus()" id="disableToggle">Focus 2</button>
-      <button md-raised-button (click)="button3.focus()" id="disableToggle">Focus 3</button>
+      <p>isDisabled: {{isDisabled}}, clickCounter: <span>{{clickCounter}}</span></p>
+      <button md-raised-button (click)="isDisabled=!isDisabled">
+        Disable buttons
+      </button>
+      <button md-raised-button (click)="button1.focus()">Focus 1</button>
+      <button md-raised-button (click)="button2.focus()">Focus 2</button>
+      <button md-raised-button (click)="button3.focus()">Focus 3</button>
     </div>
-    <button md-button #button1 [disabled]="isDisabled" (click)="clickCounter=clickCounter+1" id="testButton">off</button>
+    <button md-button #button1 [disabled]="isDisabled" (click)="clickCounter=clickCounter+1">off</button>
     <button md-button color="primary" [disabled]="isDisabled">off</button>
     <a href="http://www.google.com" #button2 md-button color="accent" [disabled]="isDisabled">off</a>
     <button md-raised-button #button3 color="primary" [disabled]="isDisabled">off</button>
@@ -80,15 +82,11 @@
     </button>
   </section>
   <section>
-    Link
-    <a href="http://www.google.com" md-button color="primary">link</a>
-    Button
-    <button md-button>flat</button>
+    <a href="http://www.google.com" md-button color="primary">SEARCH</a>
+    <button md-button>DANCE</button>
   </section>
   <section>
-    Link
-    <a href="http://www.google.com" md-raised-button color="primary">link</a>
-    Button
-    <button md-raised-button>button</button>
+    <a href="http://www.google.com" md-raised-button color="primary">SEARCH</a>
+    <button md-raised-button>DANCE</button>
   </section>
 </div>
diff --git a/src/demo-app/index.html b/src/demo-app/index.html
index f5e774118e1..d1102a18c1d 100644
--- a/src/demo-app/index.html
+++ b/src/demo-app/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 {{!-- This file is an handlebar file that gets filled at build time. --}}
-<html>
+<html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/src/e2e-app/button/button-e2e.html b/src/e2e-app/button/button-e2e.html
index a5d0c7d3ae0..b8a7ff8b0a6 100644
--- a/src/e2e-app/button/button-e2e.html
+++ b/src/e2e-app/button/button-e2e.html
@@ -1,12 +1,31 @@
 <section>
+
   <div>
-    <p>isDisabled: {{isDisabled}}, clickCounter: <span id="clickCounter">{{clickCounter}}</span></p>
-    <button md-raised-button (click)="isDisabled=!isDisabled" id="disableToggle">Disable buttons</button>
+    <p>
+      isDisabled: {{isDisabled}}, clickCounter:
+      <span id="click-counter">{{clickCounter}}</span>
+    </p>
+    <button md-raised-button (click)="isDisabled=!isDisabled" id="disable-toggle">
+      Disable buttons
+    </button>
   </div>
-  <button md-button [disabled]="isDisabled" (click)="clickCounter=clickCounter+1" id="testButton">off</button>
-  <button md-button color="primary" [disabled]="isDisabled">off</button>
-  <a href="http://www.google.com" md-button color="accent" [disabled]="isDisabled">off</a>
-  <button md-raised-button color="primary" [disabled]="isDisabled">off</button>
+
+  <button md-button [disabled]="isDisabled" (click)="clickCounter=clickCounter+1" id="test-button">
+    off
+  </button>
+
+  <button md-button color="primary" [disabled]="isDisabled">
+    off
+  </button>
+
+  <a href="http://www.google.com" md-button color="accent" [disabled]="isDisabled">
+    off
+  </a>
+
+  <button md-raised-button color="primary" [disabled]="isDisabled">
+    off
+  </button>
+
   <button md-mini-fab [disabled]="isDisabled">
     <md-icon class="md-24">check</md-icon>
   </button>
diff --git a/src/e2e-app/index.html b/src/e2e-app/index.html
index 6e4cc63acf2..1cd11593485 100644
--- a/src/e2e-app/index.html
+++ b/src/e2e-app/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 {{!-- This file is an handlebar file that gets filled at build time. --}}
-<html>
+<html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
index 3ab02a3c409..b51734ad240 100644
--- a/test/protractor.conf.js
+++ b/test/protractor.conf.js
@@ -9,19 +9,16 @@ require('ts-node').register({
 
 const E2E_BASE_URL = process.env['E2E_BASE_URL'] || 'http://localhost:4200';
 const config = {
+  // TODO(jelbourn): add back plugin for a11y assersions once it supports specifying AXS options.
   useAllAngular2AppRoots: true,
-  plugins: [{
-    chromeA11YDevTools: {
-      treatWarningsAsFailures: true
-    },
-    package: 'protractor-accessibility-plugin'
-  }],
   specs: [ path.join(__dirname, '../e2e/**/*.e2e.ts') ],
-  baseUrl: E2E_BASE_URL
+  baseUrl: E2E_BASE_URL,
+  allScriptsTimeout: 22000,
+  getPageTimeout: 20000,
 };
 
 
-if (process.env['TRAVIS'] !== undefined) {
+if (process.env['TRAVIS']) {
   const key = require('../scripts/sauce/sauce_config');
   config.sauceUser = process.env['SAUCE_USERNAME'];
   config.sauceKey = key;