From 3cf4e522c901ccd40761af1c0abe0f9b7b39f258 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Mon, 11 Apr 2016 23:23:15 -0400 Subject: [PATCH] test(app): update cordova tests to show a content as the first-child references #5934 --- ionic/components/app/test/cordova/app.html | 41 ++++++++++++++++++++ ionic/components/app/test/cordova/index.ts | 21 +++++++++- ionic/components/app/test/cordova/page1.html | 5 ++- ionic/components/app/test/cordova/page2.html | 4 ++ ionic/components/app/test/cordova/page3.html | 6 +++ 5 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 ionic/components/app/test/cordova/app.html create mode 100644 ionic/components/app/test/cordova/page3.html diff --git a/ionic/components/app/test/cordova/app.html b/ionic/components/app/test/cordova/app.html new file mode 100644 index 0000000000..c78b33c23b --- /dev/null +++ b/ionic/components/app/test/cordova/app.html @@ -0,0 +1,41 @@ + + + + Left Menu + + + + + + + Settings + + + + + + + + + + + + + + + + No toolbar + + + + + + + + + + diff --git a/ionic/components/app/test/cordova/index.ts b/ionic/components/app/test/cordova/index.ts index 15036a48b6..84acd9900e 100644 --- a/ionic/components/app/test/cordova/index.ts +++ b/ionic/components/app/test/cordova/index.ts @@ -12,7 +12,7 @@ import {App, NavController, Page, IonicApp, Modal} from 'ionic-angular'; - + The modal should have status bar padding, too because it is a toolbar. @@ -38,6 +38,8 @@ class Page1 { templateUrl: 'page2.html' }) class Page2 { + page3 = Page3; + constructor(private nav: NavController) { } @@ -49,8 +51,23 @@ class Page2 { } +@Page({ + templateUrl: 'page3.html' +}) +class Page3 { + + constructor(private nav: NavController) { + + } + + goBack() { + this.nav.pop(); + } +} + + @App({ - template: `` + templateUrl: `./app.html` }) class E2EApp { root = Page1; diff --git a/ionic/components/app/test/cordova/page1.html b/ionic/components/app/test/cordova/page1.html index 5c72ed13ca..92a3583f18 100644 --- a/ionic/components/app/test/cordova/page1.html +++ b/ionic/components/app/test/cordova/page1.html @@ -8,9 +8,12 @@ + diff --git a/ionic/components/app/test/cordova/page2.html b/ionic/components/app/test/cordova/page2.html index 6b58884015..927b62cc52 100644 --- a/ionic/components/app/test/cordova/page2.html +++ b/ionic/components/app/test/cordova/page2.html @@ -8,10 +8,14 @@ +

This is Page 2

+
diff --git a/ionic/components/app/test/cordova/page3.html b/ionic/components/app/test/cordova/page3.html new file mode 100644 index 0000000000..54000b8b43 --- /dev/null +++ b/ionic/components/app/test/cordova/page3.html @@ -0,0 +1,6 @@ + +

This is Page 3

+

No navbar should still have space on the top for the status bar.

+ + +