Fixing menu / e2e since upgrade

lathonez · Jun 29, 2016 · c0562f0 · c0562f0
1 parent 3f971ba
commit c0562f0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/app/pages/clickerList/clickerList.html b/app/pages/clickerList/clickerList.html
@@ -1,9 +1,11 @@
-<ion-navbar *navbar>
-  <button menuToggle>
-    <ion-icon name="menu"></ion-icon>
-  </button>
-  <ion-title>{{title}}</ion-title>
-</ion-navbar>
+<ion-header>
+  <ion-navbar>
+    <button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>{{title}}</ion-title>
+  </ion-navbar>
+</ion-header>
 
 <ion-content padding>
   <clicker-form></clicker-form>

diff --git a/app/pages/page2/page2.e2e.ts b/app/pages/page2/page2.e2e.ts
@@ -13,6 +13,7 @@ describe('Page2', () => {
       browser.driver.sleep(2000); // wait for the animation
       element.all(by.className('input-wrapper')).then((items) => {
         items[1].click();
+        browser.driver.sleep(2000); // wait for the animation
         expect(message.getText()).toEqual('Bye!');
       });
     });

diff --git a/app/pages/page2/page2.html b/app/pages/page2/page2.html
@@ -1,9 +1,11 @@
-<ion-navbar *navbar>
-  <button menuToggle>
-    <ion-icon name="menu"></ion-icon>
-  </button>
-  <ion-title>{{title}}</ion-title>
-</ion-navbar>
+<ion-header>
+  <ion-navbar>
+    <button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>{{title}}</ion-title>
+  </ion-navbar>
+</ion-header>
 
 <ion-content padding class="message bye-ionic">
   <h2>Bye!</h2>

diff --git a/www/index.html b/www/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>Ionic</title>
+  <title>Clickers</title>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
   <link ios-href="build/css/app.ios.css" rel="stylesheet">
   <link md-href="build/css/app.md.css" rel="stylesheet">
-  <link wp-href="build/css/app.wp.css" rel="stylesheet">  
+  <link wp-href="build/css/app.wp.css" rel="stylesheet">
 </head>
 <body>