From 3bd0b5c8ac3f0e8981bebf387a1c4cf0eb392147 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 22 Sep 2015 11:25:27 -0500
Subject: [PATCH] chore(): use class selectors in e2e

---
 demos/menu/main.html                           | 4 ++--
 demos/menu/page1.html                          | 2 +-
 demos/menu/page2.html                          | 2 +-
 demos/modal/index.ts                           | 2 +-
 demos/modal/main.html                          | 3 ++-
 ionic/components/checkbox/test/basic/e2e.ts    | 8 ++++----
 ionic/components/checkbox/test/basic/main.html | 8 ++++----
 ionic/components/menu/test/basic/e2e.ts        | 4 ++--
 ionic/components/menu/test/basic/main.html     | 2 +-
 ionic/components/menu/test/basic/page1.html    | 2 +-
 ionic/components/menu/test/basic/page2.html    | 2 +-
 ionic/components/modal/test/basic/e2e.ts       | 4 ++--
 ionic/components/modal/test/basic/index.ts     | 2 +-
 ionic/components/modal/test/basic/main.html    | 2 +-
 ionic/components/popup/test/basic/e2e.ts       | 6 +++---
 ionic/components/popup/test/basic/main.html    | 6 +++---
 ionic/components/radio/test/basic/e2e.ts       | 2 +-
 ionic/components/radio/test/basic/main.html    | 4 ++--
 ionic/components/switch/test/basic/e2e.ts      | 8 ++++----
 ionic/components/switch/test/basic/main.html   | 8 ++++----
 20 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/demos/menu/main.html b/demos/menu/main.html
index 9d00a71b6a..ca514ee63b 100644
--- a/demos/menu/main.html
+++ b/demos/menu/main.html
@@ -1,4 +1,4 @@
-<ion-menu #menu [content]="content" id="menu">
+<ion-menu #menu [content]="content">
 
   <ion-toolbar secondary>
     <ion-title>Left Menu</ion-title>
@@ -12,7 +12,7 @@
         {{p.title}}
       </button>
 
-      <button ion-item menu-toggle="menu" id="e2eCloseMenu">
+      <button ion-item menu-toggle>
         Close Menu
       </button>
 
diff --git a/demos/menu/page1.html b/demos/menu/page1.html
index 3e6be3cc0a..8ce7edcdb7 100644
--- a/demos/menu/page1.html
+++ b/demos/menu/page1.html
@@ -17,7 +17,7 @@
   <h3>Page 1</h3>
 
   <p>
-    <button id="e2eContentToggleMenu" menu-toggle>Toggle Menu</button>
+    <button menu-toggle>Toggle Menu</button>
   </p>
 
     <f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
diff --git a/demos/menu/page2.html b/demos/menu/page2.html
index b28e447269..af718dbb18 100644
--- a/demos/menu/page2.html
+++ b/demos/menu/page2.html
@@ -16,7 +16,7 @@
   <h3>Page 2</h3>
 
   <p>
-    <button menu-toggle id="e2eContentToggleMenu">Toggle Menu</button>
+    <button menu-toggle>Toggle Menu</button>
   </p>
 
 </ion-content>
diff --git a/demos/modal/index.ts b/demos/modal/index.ts
index 8cbcb09df5..3b15c4ec16 100644
--- a/demos/modal/index.ts
+++ b/demos/modal/index.ts
@@ -75,7 +75,7 @@ export class ContactModal {
 
 @IonicView({
   template: `
-    <ion-navbar *navbar><ion-title>First Page Header</ion-title><ion-nav-items primary><button id="e2eCloseMenu" (click)="closeModal()">Close</button></ion-nav-items></ion-navbar>
+    <ion-navbar *navbar><ion-title>First Page Header</ion-title><ion-nav-items primary><button (click)="closeModal()">Close</button></ion-nav-items></ion-navbar>
     <ion-content padding>
       <p>
         <button (click)="push()">Push (Go to 2nd)</button>
diff --git a/demos/modal/main.html b/demos/modal/main.html
index f52258213c..276a89ca1e 100644
--- a/demos/modal/main.html
+++ b/demos/modal/main.html
@@ -1,3 +1,4 @@
+
 <ion-content padding>
-  <button id="e2eOpenModal" (click)="openModal()">Open Modal</button>
+  <button (click)="openModal()">Open Modal</button>
 </ion-content>
diff --git a/ionic/components/checkbox/test/basic/e2e.ts b/ionic/components/checkbox/test/basic/e2e.ts
index 38e0cd5cc8..74229021d8 100644
--- a/ionic/components/checkbox/test/basic/e2e.ts
+++ b/ionic/components/checkbox/test/basic/e2e.ts
@@ -1,7 +1,7 @@
 
 it('should check apple, enable/check grape, submit form', function() {
-  element(by.css('#e2eAppleCheckbox')).click();
-  element(by.css('#e2eGrapeDisabled')).click();
-  element(by.css('#e2eGrapeChecked')).click();
-  element(by.css('#e2eSubmit')).click();
+  element(by.css('.e2eAppleCheckbox')).click();
+  element(by.css('.e2eGrapeDisabled')).click();
+  element(by.css('.e2eGrapeChecked')).click();
+  element(by.css('.e2eSubmit')).click();
 });
diff --git a/ionic/components/checkbox/test/basic/main.html b/ionic/components/checkbox/test/basic/main.html
index 946f5cc1da..7285cc2a5d 100644
--- a/ionic/components/checkbox/test/basic/main.html
+++ b/ionic/components/checkbox/test/basic/main.html
@@ -8,7 +8,7 @@
 
     <ion-list>
 
-      <ion-checkbox value="apple" checked="true" ng-control="appleCtrl" id="e2eAppleCheckbox">
+      <ion-checkbox value="apple" checked="true" ng-control="appleCtrl" class="e2eAppleCheckbox">
         Apple, value=apple, init checked
       </ion-checkbox>
 
@@ -33,9 +33,9 @@
   </form>
 
   <p aria-hidden="true" class="align-center">
-    <button (click)="toggleGrapeChecked()" outline small id="e2eGrapeChecked">Grape Checked</button>
-    <button (click)="toggleGrapeDisabled()" outline small id="e2eGrapeDisabled">Grape Disabled</button>
-    <button (click)="doSubmit($event)" outline small id="e2eSubmit">Submit</button>
+    <button (click)="toggleGrapeChecked()" outline small class="e2eGrapeChecked">Grape Checked</button>
+    <button (click)="toggleGrapeDisabled()" outline small class="e2eGrapeDisabled">Grape Disabled</button>
+    <button (click)="doSubmit($event)" outline small class="e2eSubmit">Submit</button>
   </p>
 
   <p aria-hidden="true" padding>
diff --git a/ionic/components/menu/test/basic/e2e.ts b/ionic/components/menu/test/basic/e2e.ts
index 38740de98c..0a67f84760 100644
--- a/ionic/components/menu/test/basic/e2e.ts
+++ b/ionic/components/menu/test/basic/e2e.ts
@@ -1,9 +1,9 @@
 
 it('should toggle open menu', function() {
-  element(by.css('#e2eContentToggleMenu')).click();
+  element(by.css('.e2eContentToggleMenu')).click();
 });
 
 
 it('should close menu', function() {
-  element(by.css('#e2eCloseMenu')).click();
+  element(by.css('.e2eCloseMenu')).click();
 });
diff --git a/ionic/components/menu/test/basic/main.html b/ionic/components/menu/test/basic/main.html
index 51b343e897..9bdeb5cfd0 100644
--- a/ionic/components/menu/test/basic/main.html
+++ b/ionic/components/menu/test/basic/main.html
@@ -12,7 +12,7 @@
         {{p.title}}
       </button>
 
-      <button ion-item menu-toggle no-forward-icon id="e2eCloseMenu">
+      <button ion-item menu-toggle no-forward-icon class="e2eCloseMenu">
         Close Menu
       </button>
 
diff --git a/ionic/components/menu/test/basic/page1.html b/ionic/components/menu/test/basic/page1.html
index 891f9c28fc..1881d9efdb 100644
--- a/ionic/components/menu/test/basic/page1.html
+++ b/ionic/components/menu/test/basic/page1.html
@@ -33,7 +33,7 @@
   <h3>Page 1</h3>
 
   <p>
-    <button id="e2eContentToggleMenu" menu-toggle>Toggle Menu</button>
+    <button class="e2eContentToggleMenu" menu-toggle>Toggle Menu</button>
   </p>
 
   <f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
diff --git a/ionic/components/menu/test/basic/page2.html b/ionic/components/menu/test/basic/page2.html
index c065747a38..9801c4fe64 100644
--- a/ionic/components/menu/test/basic/page2.html
+++ b/ionic/components/menu/test/basic/page2.html
@@ -16,7 +16,7 @@
   <h3>Page 2</h3>
 
   <p>
-    <button menu-toggle id="e2eContentToggleMenu">Toggle Menu</button>
+    <button menu-toggle class="e2eContentToggleMenu">Toggle Menu</button>
   </p>
 
   <p>
diff --git a/ionic/components/modal/test/basic/e2e.ts b/ionic/components/modal/test/basic/e2e.ts
index 4bb459069a..06ffff5222 100644
--- a/ionic/components/modal/test/basic/e2e.ts
+++ b/ionic/components/modal/test/basic/e2e.ts
@@ -1,8 +1,8 @@
 
 it('should open action sheet', function() {
-  element(by.css('#e2eOpenModal')).click();
+  element(by.css('.e2eOpenModal')).click();
 });
 
 it('should close with close button click', function() {
-  element(by.css('#e2eCloseMenu')).click();
+  element(by.css('.e2eCloseMenu')).click();
 });
diff --git a/ionic/components/modal/test/basic/index.ts b/ionic/components/modal/test/basic/index.ts
index 8cbcb09df5..54108b95d1 100644
--- a/ionic/components/modal/test/basic/index.ts
+++ b/ionic/components/modal/test/basic/index.ts
@@ -75,7 +75,7 @@ export class ContactModal {
 
 @IonicView({
   template: `
-    <ion-navbar *navbar><ion-title>First Page Header</ion-title><ion-nav-items primary><button id="e2eCloseMenu" (click)="closeModal()">Close</button></ion-nav-items></ion-navbar>
+    <ion-navbar *navbar><ion-title>First Page Header</ion-title><ion-nav-items primary><button class="e2eCloseMenu" (click)="closeModal()">Close</button></ion-nav-items></ion-navbar>
     <ion-content padding>
       <p>
         <button (click)="push()">Push (Go to 2nd)</button>
diff --git a/ionic/components/modal/test/basic/main.html b/ionic/components/modal/test/basic/main.html
index f52258213c..fe2467f683 100644
--- a/ionic/components/modal/test/basic/main.html
+++ b/ionic/components/modal/test/basic/main.html
@@ -1,3 +1,3 @@
 <ion-content padding>
-  <button id="e2eOpenModal" (click)="openModal()">Open Modal</button>
+  <button class="e2eOpenModal" (click)="openModal()">Open Modal</button>
 </ion-content>
diff --git a/ionic/components/popup/test/basic/e2e.ts b/ionic/components/popup/test/basic/e2e.ts
index 763d094d31..ab334a97ad 100644
--- a/ionic/components/popup/test/basic/e2e.ts
+++ b/ionic/components/popup/test/basic/e2e.ts
@@ -1,6 +1,6 @@
 
 it('should open alert', function() {
-  element(by.css('#e2eOpenAlert')).click();
+  element(by.css('.e2eOpenAlert')).click();
 });
 
 
@@ -10,7 +10,7 @@ it('should close alert', function() {
 
 
 it('should open prompt', function() {
-  element(by.css('#e2eOpenPrompt')).click();
+  element(by.css('.e2eOpenPrompt')).click();
 });
 
 
@@ -22,7 +22,7 @@ it('should close prompt', function() {
 
 
 it('should open confirm', function() {
-  element(by.css('#e2eOpenConfirm')).click();
+  element(by.css('.e2eOpenConfirm')).click();
 });
 
 
diff --git a/ionic/components/popup/test/basic/main.html b/ionic/components/popup/test/basic/main.html
index 41cb5ca5bf..adc49714bb 100644
--- a/ionic/components/popup/test/basic/main.html
+++ b/ionic/components/popup/test/basic/main.html
@@ -1,9 +1,9 @@
 
 <ion-content padding>
 
-  <button id="e2eOpenAlert" (click)="doAlert()">Alert</button>
-  <button id="e2eOpenPrompt" (click)="doPrompt()">Prompt</button>
-  <button id="e2eOpenConfirm" (click)="doConfirm()">Confirm</button>
+  <button class="e2eOpenAlert" (click)="doAlert()">Alert</button>
+  <button class="e2eOpenPrompt" (click)="doPrompt()">Prompt</button>
+  <button class="e2eOpenConfirm" (click)="doConfirm()">Confirm</button>
 
   <pre>
     Alert Opened: {{alertOpen}}
diff --git a/ionic/components/radio/test/basic/e2e.ts b/ionic/components/radio/test/basic/e2e.ts
index e3dae7af7b..03b88753bd 100644
--- a/ionic/components/radio/test/basic/e2e.ts
+++ b/ionic/components/radio/test/basic/e2e.ts
@@ -1,4 +1,4 @@
 
 it('should check Cherry', function() {
-  element(by.css('#e2eCherry')).click();
+  element(by.css('.e2eCherry')).click();
 });
diff --git a/ionic/components/radio/test/basic/main.html b/ionic/components/radio/test/basic/main.html
index dab8700e8f..61e4269885 100644
--- a/ionic/components/radio/test/basic/main.html
+++ b/ionic/components/radio/test/basic/main.html
@@ -16,7 +16,7 @@
         Apple
       </ion-radio>
 
-      <ion-radio value="banana" id="e2eBanana">
+      <ion-radio value="banana" class="e2eBanana">
         Banana
       </ion-radio>
 
@@ -35,7 +35,7 @@
   <p aria-hidden="true" class="align-center">
     <button (click)="setApple()" outline small>Select Apple</button>
     <button (click)="setBanana()" outline small>Select Banana</button>
-    <button id="e2eCherry" (click)="setCherry()" outline small>Select Cherry</button>
+    <button class="e2eCherry" (click)="setCherry()" outline small>Select Cherry</button>
   </p>
 
   <p>
diff --git a/ionic/components/switch/test/basic/e2e.ts b/ionic/components/switch/test/basic/e2e.ts
index 637870c76b..10ba7f169f 100644
--- a/ionic/components/switch/test/basic/e2e.ts
+++ b/ionic/components/switch/test/basic/e2e.ts
@@ -1,11 +1,11 @@
 
 it('should check apple via switch element click', function() {
-  element(by.css('#e2eAppleCheckbox .media-switch')).click();
+  element(by.css('.e2eAppleCheckbox .media-switch')).click();
 });
 
 
 it('should enable/check grape via buttons and submit form', function() {
-  element(by.css('#e2eGrapeDisabled')).click();
-  element(by.css('#e2eGrapeChecked')).click();
-  element(by.css('#e2eSubmit')).click();
+  element(by.css('.e2eGrapeDisabled')).click();
+  element(by.css('.e2eGrapeChecked')).click();
+  element(by.css('.e2eSubmit')).click();
 });
diff --git a/ionic/components/switch/test/basic/main.html b/ionic/components/switch/test/basic/main.html
index 2c6356b6d0..9c15e91767 100644
--- a/ionic/components/switch/test/basic/main.html
+++ b/ionic/components/switch/test/basic/main.html
@@ -8,7 +8,7 @@
 
     <ion-list>
 
-      <ion-switch value="apple" checked="true" ng-control="appleCtrl" id="e2eAppleCheckbox">
+      <ion-switch value="apple" checked="true" ng-control="appleCtrl" class="e2eAppleCheckbox">
         Apple, value=apple, init checked
       </ion-switch>
 
@@ -33,9 +33,9 @@
   </form>
 
   <p aria-hidden="true" class="align-center">
-    <button (click)="toggleGrapeChecked()" outline small id="e2eGrapeChecked">Grape Checked</button>
-    <button (click)="toggleGrapeDisabled()" outline small id="e2eGrapeDisabled">Grape Disabled</button>
-    <button (click)="doSubmit($event)" outline small id="e2eSubmit">Submit</button>
+    <button (click)="toggleGrapeChecked()" outline small class="e2eGrapeChecked">Grape Checked</button>
+    <button (click)="toggleGrapeDisabled()" outline small class="e2eGrapeDisabled">Grape Disabled</button>
+    <button (click)="doSubmit($event)" outline small class="e2eSubmit">Submit</button>
   </p>
 
   <p aria-hidden="true" padding>