From 0450a4e812201911fcb3109461c9b9b8aeed2830 Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.valladolid@gmail.com>
Date: Fri, 9 Dec 2016 10:39:40 +0100
Subject: [PATCH] test(picker): adds push() to test hardware go back

---
 src/components/app/app.ts                      |  8 ++++++--
 src/components/picker/test/basic/app-module.ts | 11 +++++++++--
 src/components/picker/test/basic/main.html     |  3 +++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 0afab2cd41..b5650fdab6 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -79,11 +79,12 @@ export class App {
 
     runInDev(() => {
       // During developement, navPop can be triggered by calling
-      // window.ClickBackButton();
+      // window.HWBackButton();
       if (!(<any>window)['HWBackButton']) {
         (<any>window)['HWBackButton'] = () => {
           let p = this.goBack();
           p && p.catch(() => console.debug('hardware go back cancelled'));
+          return p;
         };
       }
     });
@@ -194,7 +195,7 @@ export class App {
   }
 
   /**
-   * @return {NavController} Retuns the root NavController
+   * @return {NavController} Returns the root NavController
    */
   getRootNav(): NavController {
     return this._rootNav;
@@ -232,6 +233,9 @@ export class App {
     return portal.insertPages(-1, [enteringView], opts);
   }
 
+  /**
+   * @private
+   */
   goBack(): Promise<any> {
     if (this._menuCtrl && this._menuCtrl.isOpen()) {
       return this._menuCtrl.close();
diff --git a/src/components/picker/test/basic/app-module.ts b/src/components/picker/test/basic/app-module.ts
index 642e7a81e0..bccebf5e86 100644
--- a/src/components/picker/test/basic/app-module.ts
+++ b/src/components/picker/test/basic/app-module.ts
@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation, NgModule } from '@angular/core';
-import { IonicApp, IonicModule, PickerController } from '../../../..';
+import { IonicApp, IonicModule, NavController, PickerController } from '../../../..';
 
 
 @Component({
@@ -10,7 +10,14 @@ export class E2EPage {
   smoothie: string;
   timer: string;
 
-  constructor(private pickerCtrl: PickerController) {}
+  constructor(
+    public navCtrl: NavController,
+    private pickerCtrl: PickerController
+  ) { }
+
+  push() {
+    this.navCtrl.push(E2EPage);
+  }
 
   twoColumns() {
     let picker = this.pickerCtrl.create({
diff --git a/src/components/picker/test/basic/main.html b/src/components/picker/test/basic/main.html
index 0ea6843816..882b9c4cc7 100644
--- a/src/components/picker/test/basic/main.html
+++ b/src/components/picker/test/basic/main.html
@@ -2,6 +2,9 @@
 
   <ion-navbar>
     <ion-title>Picker</ion-title>
+    <ion-buttons end>
+      <button ion-button strong (click)="push()">Push</button>
+    </ion-buttons>
   </ion-navbar>
 
 </ion-header>