diff --git a/src/components/action-sheet/test/basic/app/app.component.ts b/src/components/action-sheet/test/basic/app/app.component.ts new file mode 100644 index 0000000000..e84bb7d13a --- /dev/null +++ b/src/components/action-sheet/test/basic/app/app.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + root = PageOne; +} diff --git a/src/components/action-sheet/test/basic/app/app.module.ts b/src/components/action-sheet/test/basic/app/app.module.ts new file mode 100644 index 0000000000..5ebd4d5faa --- /dev/null +++ b/src/components/action-sheet/test/basic/app/app.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { ModalPageModule } from '../pages/modal-page/modal-page.module'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent, + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + ModalPageModule, + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/action-sheet/test/basic/app/main.ts b/src/components/action-sheet/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/action-sheet/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/action-sheet/test/basic/e2e.ts b/src/components/action-sheet/test/basic/e2e.ts index 08c0d1b93e..44397c86ed 100644 --- a/src/components/action-sheet/test/basic/e2e.ts +++ b/src/components/action-sheet/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open action sheet', function() { element(by.css('.e2eOpenActionSheet')).click(); diff --git a/src/components/action-sheet/test/basic/pages/modal-page/modal-page.module.ts b/src/components/action-sheet/test/basic/pages/modal-page/modal-page.module.ts new file mode 100644 index 0000000000..f67d959fdc --- /dev/null +++ b/src/components/action-sheet/test/basic/pages/modal-page/modal-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { ModalPage } from './modal-page'; + +@NgModule({ + declarations: [ + ModalPage, + ], + imports: [ + DeepLinkModule.forChild(ModalPage), + ], + entryComponents: [ + ModalPage, + ] +}) +export class ModalPageModule {} diff --git a/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts b/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts new file mode 100644 index 0000000000..ef943c06da --- /dev/null +++ b/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts @@ -0,0 +1,26 @@ +import { Component } from '@angular/core'; +import { ViewController } from '../../../../../..'; + +@Component({ + template: ` + + + + + + Modal + + + + Hi, I'm Bob, and I'm a modal. + + ` +}) +export class ModalPage { + + constructor(public viewCtrl: ViewController) {} + + dismiss() { + this.viewCtrl.dismiss(); + } +} diff --git a/src/components/action-sheet/test/basic/main.html b/src/components/action-sheet/test/basic/pages/page-one/page-one.html similarity index 100% rename from src/components/action-sheet/test/basic/main.html rename to src/components/action-sheet/test/basic/pages/page-one/page-one.html diff --git a/src/components/action-sheet/test/basic/pages/page-one/page-one.module.ts b/src/components/action-sheet/test/basic/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/action-sheet/test/basic/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/action-sheet/test/basic/app.module.ts b/src/components/action-sheet/test/basic/pages/page-one/page-one.ts similarity index 77% rename from src/components/action-sheet/test/basic/app.module.ts rename to src/components/action-sheet/test/basic/pages/page-one/page-one.ts index 3ba7f53090..cdc65dfc73 100644 --- a/src/components/action-sheet/test/basic/app.module.ts +++ b/src/components/action-sheet/test/basic/pages/page-one/page-one.ts @@ -1,10 +1,12 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, ActionSheetController, AlertController, ModalController, ViewController, Platform } from '../../../../../ionic-angular'; +import { Component } from '@angular/core'; +import { ActionSheetController, AlertController, ModalController, Platform } from '../../../../../..'; + +import { ModalPage } from '../modal-page/modal-page'; @Component({ - templateUrl: 'main.html' + templateUrl: 'page-one.html' }) -export class E2EPage { +export class PageOne { result: string = ''; constructor(public actionSheetCtrl: ActionSheetController, public alertCtrl: AlertController, public modalCtrl: ModalController, public plt: Platform) {} @@ -152,53 +154,3 @@ export class E2EPage { } } - -@Component({ - template: ` - - - - - - Modal - - - - Hi, I'm Bob, and I'm a modal. - - ` -}) -export class ModalPage { - - constructor(public viewCtrl: ViewController) {} - - dismiss() { - this.viewCtrl.dismiss(); - } -} - - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - - -@NgModule({ - declarations: [ - E2EApp, - E2EPage, - ModalPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage, - ModalPage - ] -}) -export class AppModule {} diff --git a/src/components/alert/test/basic/app/app.component.ts b/src/components/alert/test/basic/app/app.component.ts new file mode 100644 index 0000000000..2334bff782 --- /dev/null +++ b/src/components/alert/test/basic/app/app.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class E2EApp { + root = PageOne; +} diff --git a/src/components/alert/test/basic/app/app.module.ts b/src/components/alert/test/basic/app/app.module.ts new file mode 100644 index 0000000000..100da8673d --- /dev/null +++ b/src/components/alert/test/basic/app/app.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { E2EApp } from './app.component'; +import { ModalPageModule } from '../pages/modal-page/modal-page.module'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + E2EApp + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp), + ModalPageModule, + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/alert/test/basic/app/main.ts b/src/components/alert/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/alert/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/alert/test/basic/e2e.ts b/src/components/alert/test/basic/e2e.ts index dfa5a89526..ca2aed83a7 100644 --- a/src/components/alert/test/basic/e2e.ts +++ b/src/components/alert/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open basic alert', function() { element(by.css('.e2eOpenAlert')).click(); diff --git a/src/components/alert/test/basic/pages/modal-page/modal-page.module.ts b/src/components/alert/test/basic/pages/modal-page/modal-page.module.ts new file mode 100644 index 0000000000..f67d959fdc --- /dev/null +++ b/src/components/alert/test/basic/pages/modal-page/modal-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { ModalPage } from './modal-page'; + +@NgModule({ + declarations: [ + ModalPage, + ], + imports: [ + DeepLinkModule.forChild(ModalPage), + ], + entryComponents: [ + ModalPage, + ] +}) +export class ModalPageModule {} diff --git a/src/components/alert/test/basic/pages/modal-page/modal-page.ts b/src/components/alert/test/basic/pages/modal-page/modal-page.ts new file mode 100644 index 0000000000..e556ca7302 --- /dev/null +++ b/src/components/alert/test/basic/pages/modal-page/modal-page.ts @@ -0,0 +1,26 @@ +import { Component } from '@angular/core'; +import { ViewController } from '../../../../../..'; + +@Component({ + template: ` + + + + + + Modal + + + + Hi, I'm Bob, and I'm a modal. +
+ + ` +}) +export class ModalPage { + constructor(private viewCtrl: ViewController) {} + + dismiss() { + this.viewCtrl.dismiss(); + } +} diff --git a/src/components/alert/test/basic/main.html b/src/components/alert/test/basic/pages/page-one/page-one.html similarity index 100% rename from src/components/alert/test/basic/main.html rename to src/components/alert/test/basic/pages/page-one/page-one.html diff --git a/src/components/alert/test/basic/pages/page-one/page-one.module.ts b/src/components/alert/test/basic/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/alert/test/basic/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/alert/test/basic/app.module.ts b/src/components/alert/test/basic/pages/page-one/page-one.ts similarity index 87% rename from src/components/alert/test/basic/app.module.ts rename to src/components/alert/test/basic/pages/page-one/page-one.ts index fd0a8d8cf7..8d9e1a2eb6 100644 --- a/src/components/alert/test/basic/app.module.ts +++ b/src/components/alert/test/basic/pages/page-one/page-one.ts @@ -1,11 +1,12 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, AlertController, ModalController, ViewController } from '../../../../../ionic-angular'; +import { Component } from '@angular/core'; +import { AlertController, ModalController } from '../../../../../..'; +import { ModalPage } from '../modal-page/modal-page'; @Component({ - templateUrl: 'main.html' + templateUrl: 'page-one.html' }) -export class E2EPage { +export class PageOne { testConfirmOpen: boolean = false; testPromptOpen: boolean = false; testConfirmResult: string = ''; @@ -301,52 +302,3 @@ export class E2EPage { console.log('E2EPage, ionViewDidEnter'); } } - -@Component({ - template: ` - - - - - - Modal - - - - Hi, I'm Bob, and I'm a modal. -
- - ` -}) -export class ModalPage { - constructor(private viewCtrl: ViewController) {} - - dismiss() { - this.viewCtrl.dismiss(); - } -} - - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage, - ModalPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage, - ModalPage - ] -}) -export class AppModule {} diff --git a/src/components/alert/test/dismiss/app.module.ts b/src/components/alert/test/dismiss/app.module.ts index 5d418ad9a1..269b4d25a4 100644 --- a/src/components/alert/test/dismiss/app.module.ts +++ b/src/components/alert/test/dismiss/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, AlertController, LoadingController, NavController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, AlertController, LoadingController, NavController } from '../../../..'; import { FormBuilder, Validators } from '@angular/forms'; @@ -180,6 +181,7 @@ export class E2EApp { AnotherPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/alert/test/dismiss/main.ts b/src/components/alert/test/dismiss/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/alert/test/dismiss/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/app/test/animations/app.module.ts b/src/components/app/test/animations/app.module.ts index 1e7da32411..cf3ea8a865 100644 --- a/src/components/app/test/animations/app.module.ts +++ b/src/components/app/test/animations/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { Animation, Config, IonicApp, IonicModule, Platform } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { Animation, Config, IonicApp, IonicModule, Platform } from '../../../..'; @Component({ @@ -67,6 +68,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/app/test/animations/main.ts b/src/components/app/test/animations/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/app/test/animations/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/app/test/app.spec.ts b/src/components/app/test/app.spec.ts index 78dd2c1622..8b598d504d 100644 --- a/src/components/app/test/app.spec.ts +++ b/src/components/app/test/app.spec.ts @@ -1,9 +1,9 @@ import { App } from '../app'; -import { AppPortal } from '../app-root'; import { ClickBlock } from '../../../util/click-block'; import { Config } from '../../../config/config'; import { mockApp, mockConfig, mockElementRef, mockNavController, mockPlatform, MockPlatform, mockRenderer, mockTab, mockTabs, mockView, mockViews } from '../../../util/mock-providers'; import { OverlayPortal } from '../../nav/overlay-portal'; +import { PORTAL_MODAL } from '../app-constants'; describe('App', () => { @@ -146,13 +146,13 @@ describe('App', () => { expect(plt.exitApp).not.toHaveBeenCalled(); }); - it('should pop the overlay in the portal of the root nav', () => { + it('should pop the overlay in the portal of the root nav', (done: Function) => { let nav = mockNavController(); app._setRootNav(nav); spyOn(plt, 'exitApp'); spyOn(nav, 'pop'); - spyOn(portal, 'pop'); + spyOn(portal, 'pop').and.returnValue(Promise.resolve()); let view1 = mockView(); let view2 = mockView(); @@ -161,11 +161,14 @@ describe('App', () => { let overlay1 = mockView(); mockViews(portal, [overlay1]); - app.goBack(); - - expect(portal.pop).toHaveBeenCalled(); - expect(nav.pop).not.toHaveBeenCalled(); - expect(plt.exitApp).not.toHaveBeenCalled(); + app.goBack().then(() => { + expect(portal.pop).toHaveBeenCalled(); + expect(nav.pop).not.toHaveBeenCalled(); + expect(plt.exitApp).not.toHaveBeenCalled(); + done(); + }).catch((err: Error) => { + done(err); + }); }); it('should pop the second view in the root nav', () => { @@ -471,7 +474,7 @@ describe('App', () => { config = mockConfig(); plt = mockPlatform(); app = mockApp(config, plt); - portal = app._appRoot._getPortal(AppPortal.MODAL); + portal = app._appRoot._getPortal(PORTAL_MODAL); }); }); diff --git a/src/components/app/test/cordova/app.module.ts b/src/components/app/test/cordova/app.module.ts deleted file mode 100644 index eea9b362dc..0000000000 --- a/src/components/app/test/cordova/app.module.ts +++ /dev/null @@ -1,173 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, NavController, ModalController, ViewController } from '../../../../../ionic-angular'; -import { Injectable } from '@angular/core'; - - -@Injectable() -export class SomeData { - constructor() {} - - getData() { - return 'SomeData'; - } -} - -@Injectable() -export class OtherData { - constructor() {} - - getData() { - return 'OtherData'; - } -} - -@Component({ - template: ` - - - This is a modal - - - - - - - - - -

The modal toolbar should have status bar padding.

- - - ` -}) -export class MyModal { - constructor(public viewCtrl: ViewController) {} - - dismissModal() { - this.viewCtrl.dismiss(); - } -} - - -@Component({ - templateUrl: 'page1.html' -}) -export class Page1 { - page2 = Page2; - sort: string = 'all'; - - constructor(public navCtrl: NavController, public someData: SomeData, public otherData: OtherData) { - console.log('Got some data from', someData.getData()); - console.log('Got some data from', otherData.getData()); - } - - goToTabs() { - this.navCtrl.push(TabsPage); - } -} - - -@Component({ - templateUrl: 'page2.html' -}) -export class Page2 { - page1 = Page1; - page3 = Page3; - - constructor(public modalCtrl: ModalController) {} - - openModal() { - this.modalCtrl.create(MyModal).present(); - } -} - - -@Component({ - templateUrl: 'page3.html' -}) -export class Page3 { - constructor(public navCtrl: NavController) {} - - goBack() { - this.navCtrl.pop(); - } -} - - -@Component({ - template: ` - - - This is a tab page - - - - - - - -

The toolbar should have status bar padding.

- - ` -}) -export class TabPage1 {} - -@Component({ - templateUrl: 'tabs.html' -}) -export class TabsPage { - tab1Root = TabPage1; - tab2Root = Page2; - tab3Root = Page3; - - constructor(public navCtrl: NavController) {} - - goBack() { - this.navCtrl.pop(); - } -} - - -@Component({ - templateUrl: `./app.html` -}) -export class E2EApp { - root = Page1; -} - - -@NgModule({ - declarations: [ - E2EApp, - TabsPage, - TabPage1, - Page1, - Page2, - Page3, - MyModal - ], - imports: [ - IonicModule.forRoot(E2EApp, { - statusbarPadding: true - }) - ], - providers: [SomeData, OtherData], - bootstrap: [IonicApp], - entryComponents: [ - TabsPage, - TabPage1, - Page1, - Page2, - Page3, - MyModal - ] -}) -export class AppModule {} diff --git a/src/components/app/test/cordova/app.html b/src/components/app/test/cordova/app/app.component.html similarity index 100% rename from src/components/app/test/cordova/app.html rename to src/components/app/test/cordova/app/app.component.html diff --git a/src/components/app/test/cordova/app/app.component.ts b/src/components/app/test/cordova/app/app.component.ts new file mode 100644 index 0000000000..33bf2d6cff --- /dev/null +++ b/src/components/app/test/cordova/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + templateUrl: `./app.component.html` +}) +export class E2EApp { + root = PageOne; +} diff --git a/src/components/app/test/cordova/app/app.module.ts b/src/components/app/test/cordova/app/app.module.ts new file mode 100644 index 0000000000..a0e62ea1b7 --- /dev/null +++ b/src/components/app/test/cordova/app/app.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { E2EApp } from './app.component'; +import { PageOne } from '../pages/page-one/page-one'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + E2EApp, + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp, { statusbarPadding: true }, { + links: [ + { name: 'page-one', component: PageOne }, + { name: 'page-two', loadChildren: '../pages/page-two/page-two.module#PageTwoModule'}, + { name: 'page-three', loadChildren: '../pages/page-three/page-three.module#PageThreeModule'}, + { name: 'tabs-page', loadChildren: '../pages/tabs/tabs-page.module#TabsPageModule'}, + { name: 'tabs-page-one', loadChildren: '../pages/tabs-page-one/tabs-page-one.module#TabsPageOneModule'}, + ] + }), + PageOneModule + ], + bootstrap: [IonicApp], +}) +export class AppModule {} diff --git a/src/components/app/test/cordova/app/main.ts b/src/components/app/test/cordova/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/app/test/cordova/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/app/test/cordova/e2e.ts b/src/components/app/test/cordova/e2e.ts index 7edbfc134e..12ef5f9d04 100644 --- a/src/components/app/test/cordova/e2e.ts +++ b/src/components/app/test/cordova/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should navigate to page 2', function() { element(by.css('.e2eCordovaPage2')).click(); diff --git a/src/components/app/test/cordova/pages/modal/modal-page.ts b/src/components/app/test/cordova/pages/modal/modal-page.ts new file mode 100644 index 0000000000..1614c85fab --- /dev/null +++ b/src/components/app/test/cordova/pages/modal/modal-page.ts @@ -0,0 +1,33 @@ +import { Component } from '@angular/core'; +import { ViewController } from '../../../../../..'; + +@Component({ + template: ` + + + This is a modal + + + + + + + + + +

The modal toolbar should have status bar padding.

+ + + ` +}) +export class ModalPage { + constructor(public viewCtrl: ViewController) {} + + dismissModal() { + this.viewCtrl.dismiss(); + } +} \ No newline at end of file diff --git a/src/components/app/test/cordova/pages/modal/modal.module.ts b/src/components/app/test/cordova/pages/modal/modal.module.ts new file mode 100644 index 0000000000..b9b58a08c9 --- /dev/null +++ b/src/components/app/test/cordova/pages/modal/modal.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { ModalPage } from './modal-page'; + +@NgModule({ + declarations: [ + ModalPage + ], + imports: [ + DeepLinkModule.forChild(ModalPage) + ], + entryComponents: [ + ModalPage + ] +}) +export class ModalPageModule {} diff --git a/src/components/app/test/cordova/page1.html b/src/components/app/test/cordova/pages/page-one/page-one.html similarity index 100% rename from src/components/app/test/cordova/page1.html rename to src/components/app/test/cordova/pages/page-one/page-one.html diff --git a/src/components/app/test/cordova/pages/page-one/page-one.module.ts b/src/components/app/test/cordova/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..8e9870b03d --- /dev/null +++ b/src/components/app/test/cordova/pages/page-one/page-one.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +import { SomeData } from './provider-one'; +import { OtherData } from './provider-two'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ], + providers: [ + SomeData, + OtherData + ] +}) +export class PageOneModule {} diff --git a/src/components/app/test/cordova/pages/page-one/page-one.ts b/src/components/app/test/cordova/pages/page-one/page-one.ts new file mode 100644 index 0000000000..a2aa17580a --- /dev/null +++ b/src/components/app/test/cordova/pages/page-one/page-one.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; +import { NavController } from '../../../../../..'; + +import { SomeData } from './provider-one'; +import { OtherData } from './provider-two'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne { + page2 = 'page-two'; + sort: string = 'all'; + + constructor(public navCtrl: NavController, public someData: SomeData, public otherData: OtherData) { + console.log('Got some data from', someData.getData()); + console.log('Got some data from', otherData.getData()); + } + + goToTabs() { + this.navCtrl.push('tabs-page'); + } +} diff --git a/src/components/app/test/cordova/pages/page-one/provider-one.ts b/src/components/app/test/cordova/pages/page-one/provider-one.ts new file mode 100644 index 0000000000..47b9313688 --- /dev/null +++ b/src/components/app/test/cordova/pages/page-one/provider-one.ts @@ -0,0 +1,10 @@ +import { Injectable } from '@angular/core'; + +@Injectable() +export class SomeData { + constructor() {} + + getData() { + return 'SomeData'; + } +} diff --git a/src/components/app/test/cordova/pages/page-one/provider-two.ts b/src/components/app/test/cordova/pages/page-one/provider-two.ts new file mode 100644 index 0000000000..0e580118ce --- /dev/null +++ b/src/components/app/test/cordova/pages/page-one/provider-two.ts @@ -0,0 +1,10 @@ +import { Injectable } from '@angular/core'; + +@Injectable() +export class OtherData { + constructor() {} + + getData() { + return 'OtherData'; + } +} diff --git a/src/components/app/test/cordova/page3.html b/src/components/app/test/cordova/pages/page-three/page-three.html similarity index 100% rename from src/components/app/test/cordova/page3.html rename to src/components/app/test/cordova/pages/page-three/page-three.html diff --git a/src/components/app/test/cordova/pages/page-three/page-three.module.ts b/src/components/app/test/cordova/pages/page-three/page-three.module.ts new file mode 100644 index 0000000000..1dc600afd5 --- /dev/null +++ b/src/components/app/test/cordova/pages/page-three/page-three.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageThree } from './page-three'; + +@NgModule({ + declarations: [ + PageThree, + ], + imports: [ + DeepLinkModule.forChild(PageThree) + ], + entryComponents: [ + PageThree, + ] +}) +export class PageThreeModule {} diff --git a/src/components/app/test/cordova/pages/page-three/page-three.ts b/src/components/app/test/cordova/pages/page-three/page-three.ts new file mode 100644 index 0000000000..7944b2178f --- /dev/null +++ b/src/components/app/test/cordova/pages/page-three/page-three.ts @@ -0,0 +1,13 @@ +import { Component } from '@angular/core'; +import { NavController } from '../../../../../..'; + +@Component({ + templateUrl: 'page-three.html' +}) +export class PageThree { + constructor(public navCtrl: NavController) {} + + goBack() { + this.navCtrl.pop(); + } +} diff --git a/src/components/app/test/cordova/page2.html b/src/components/app/test/cordova/pages/page-two/page-two.html similarity index 100% rename from src/components/app/test/cordova/page2.html rename to src/components/app/test/cordova/pages/page-two/page-two.html diff --git a/src/components/app/test/cordova/pages/page-two/page-two.module.ts b/src/components/app/test/cordova/pages/page-two/page-two.module.ts new file mode 100644 index 0000000000..80d26bcf50 --- /dev/null +++ b/src/components/app/test/cordova/pages/page-two/page-two.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageTwo } from './page-two'; +import { ModalPageModule } from '../modal/modal.module'; + +@NgModule({ + declarations: [ + PageTwo, + ], + imports: [ + DeepLinkModule.forChild(PageTwo), + ModalPageModule + ], + entryComponents: [ + PageTwo, + ] +}) +export class PageTwoModule {} diff --git a/src/components/app/test/cordova/pages/page-two/page-two.ts b/src/components/app/test/cordova/pages/page-two/page-two.ts new file mode 100644 index 0000000000..3b61a8d10e --- /dev/null +++ b/src/components/app/test/cordova/pages/page-two/page-two.ts @@ -0,0 +1,19 @@ +import { Component } from '@angular/core'; +import { ModalController } from '../../../../../..'; + +import { ModalPage } from '../modal/modal-page'; + +@Component({ + templateUrl: 'page-two.html' +}) +export class PageTwo { + page1 = 'page-one'; + page3 = 'page-three'; + + constructor(public modalCtrl: ModalController) {} + + openModal() { + const modal = this.modalCtrl.create(ModalPage); + modal.present(); + } +} diff --git a/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.module.ts b/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.module.ts new file mode 100644 index 0000000000..c23f00bc34 --- /dev/null +++ b/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { TabsPageOne } from './tabs-page-one'; + +@NgModule({ + declarations: [ + TabsPageOne, + ], + imports: [ + DeepLinkModule.forChild(TabsPageOne) + ], + entryComponents: [ + TabsPageOne, + ] +}) +export class TabsPageOneModule {} diff --git a/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts b/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts new file mode 100644 index 0000000000..26afa72082 --- /dev/null +++ b/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts @@ -0,0 +1,24 @@ +import { Component } from '@angular/core'; + +@Component({ + template: ` + + + This is a tab page + + + + + + + +

The toolbar should have status bar padding.

+ + ` +}) +export class TabsPageOne { +} diff --git a/src/components/app/test/cordova/tabs.html b/src/components/app/test/cordova/pages/tabs/tabs-page.html similarity index 100% rename from src/components/app/test/cordova/tabs.html rename to src/components/app/test/cordova/pages/tabs/tabs-page.html diff --git a/src/components/app/test/cordova/pages/tabs/tabs-page.module.ts b/src/components/app/test/cordova/pages/tabs/tabs-page.module.ts new file mode 100644 index 0000000000..b89979dcd3 --- /dev/null +++ b/src/components/app/test/cordova/pages/tabs/tabs-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { TabsPage } from './tabs-page'; + +@NgModule({ + declarations: [ + TabsPage, + ], + imports: [ + DeepLinkModule.forChild(TabsPage) + ], + entryComponents: [ + TabsPage, + ] +}) +export class TabsPageModule {} diff --git a/src/components/app/test/cordova/pages/tabs/tabs-page.ts b/src/components/app/test/cordova/pages/tabs/tabs-page.ts new file mode 100644 index 0000000000..3ef8aefdd7 --- /dev/null +++ b/src/components/app/test/cordova/pages/tabs/tabs-page.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; +import { NavController } from '../../../../../..'; + +@Component({ + templateUrl: 'tabs-page.html' +}) +export class TabsPage { + tab1Root = 'tabs-page-one'; + tab2Root = 'page-two'; + tab3Root = 'page-three'; + + constructor(public navCtrl: NavController) {} + + goBack() { + this.navCtrl.pop(); + } +} diff --git a/src/components/app/test/gesture-collision/app.module.ts b/src/components/app/test/gesture-collision/app.module.ts deleted file mode 100644 index 968fef33de..0000000000 --- a/src/components/app/test/gesture-collision/app.module.ts +++ /dev/null @@ -1,86 +0,0 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, MenuController, NavController, AlertController, Nav, Refresher } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'page1.html' -}) -export class Page1 { - constructor(public navCtrl: NavController, public alertCtrl: AlertController) {} - - presentAlert() { - let alert = this.alertCtrl.create({ - title: 'New Friend!', - message: 'Your friend, Obi wan Kenobi, just accepted your friend request!', - cssClass: 'my-alert', - buttons: ['Ok'] - }); - alert.present(); - } - - goToPage1() { - this.navCtrl.push(Page1); - } - - doRefresh(refresher: Refresher) { - setTimeout(() => { - refresher.complete(); - }, 1000); - } -} - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - rootPage: any; - changeDetectionCount: number = 0; - pages: Array<{title: string, component: any}>; - @ViewChild(Nav) nav: Nav; - - constructor(private menu: MenuController) { - this.rootPage = Page1; - - this.pages = [ - { title: 'Page 1', component: Page1 }, - { title: 'Page 2', component: Page1 }, - { title: 'Page 3', component: Page1 }, - ]; - } - - openPage(page: any) { - // Reset the content nav to have just this page - // we wouldn't want the back button to show in this scenario - this.nav.setRoot(page.component).then(() => { - // wait for the root page to be completely loaded - // then close the menu - this.menu.close(); - }); - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - - -@NgModule({ - declarations: [ - E2EApp, - E2EPage, - Page1 - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage, - Page1 - ] -}) -export class AppModule {} diff --git a/src/components/app/test/gesture-collision/app/app.component.ts b/src/components/app/test/gesture-collision/app/app.component.ts new file mode 100644 index 0000000000..40cb41e266 --- /dev/null +++ b/src/components/app/test/gesture-collision/app/app.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/app/test/gesture-collision/app/app.module.ts b/src/components/app/test/gesture-collision/app/app.module.ts new file mode 100644 index 0000000000..cd041f97e3 --- /dev/null +++ b/src/components/app/test/gesture-collision/app/app.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent, {}, { + links: [ + { name: 'page-one', loadChildren: '../pages/page-one/page-one.module#PageOneModule'}, + { name: 'page-two', loadChildren: '../pages/page-two/page-two.module#PageTwoModule'}, + ] + }), + PageOneModule + ], + bootstrap: [IonicApp], + entryComponents: [ + ] +}) +export class AppModule {} diff --git a/src/components/app/test/gesture-collision/app/main.ts b/src/components/app/test/gesture-collision/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/app/test/gesture-collision/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/app/test/gesture-collision/main.html b/src/components/app/test/gesture-collision/pages/page-one/page-one.html similarity index 100% rename from src/components/app/test/gesture-collision/main.html rename to src/components/app/test/gesture-collision/pages/page-one/page-one.html diff --git a/src/components/app/test/gesture-collision/pages/page-one/page-one.module.ts b/src/components/app/test/gesture-collision/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/app/test/gesture-collision/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/app/test/gesture-collision/pages/page-one/page-one.ts b/src/components/app/test/gesture-collision/pages/page-one/page-one.ts new file mode 100644 index 0000000000..033c86fc59 --- /dev/null +++ b/src/components/app/test/gesture-collision/pages/page-one/page-one.ts @@ -0,0 +1,33 @@ +import { Component, ViewChild } from '@angular/core'; +import { MenuController, Nav } from '../../../../../..'; + + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne { + rootPage: any; + changeDetectionCount: number = 0; + pages: Array<{title: string, component: any}>; + @ViewChild(Nav) nav: Nav; + + constructor(private menu: MenuController) { + this.rootPage = 'page-two'; + + this.pages = [ + { title: 'Page 1', component: 'page-two' }, + { title: 'Page 2', component: 'page-two' }, + { title: 'Page 3', component: 'page-two' }, + ]; + } + + openPage(page: any) { + // Reset the content nav to have just this page + // we wouldn't want the back button to show in this scenario + this.nav.setRoot(page.component).then(() => { + // wait for the root page to be completely loaded + // then close the menu + this.menu.close(); + }); + } +} diff --git a/src/components/app/test/gesture-collision/page1.html b/src/components/app/test/gesture-collision/pages/page-two/page-two.html similarity index 97% rename from src/components/app/test/gesture-collision/page1.html rename to src/components/app/test/gesture-collision/pages/page-two/page-two.html index 6c685e1f71..2a40b26870 100644 --- a/src/components/app/test/gesture-collision/page1.html +++ b/src/components/app/test/gesture-collision/pages/page-two/page-two.html @@ -84,7 +84,7 @@ - + RANGE diff --git a/src/components/app/test/gesture-collision/pages/page-two/page-two.module.ts b/src/components/app/test/gesture-collision/pages/page-two/page-two.module.ts new file mode 100644 index 0000000000..2bd4a81ad7 --- /dev/null +++ b/src/components/app/test/gesture-collision/pages/page-two/page-two.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageTwo } from './page-two'; + +@NgModule({ + declarations: [ + PageTwo, + ], + imports: [ + DeepLinkModule.forChild(PageTwo), + ], + entryComponents: [ + PageTwo, + ] +}) +export class PageTwoModule {} diff --git a/src/components/app/test/gesture-collision/pages/page-two/page-two.ts b/src/components/app/test/gesture-collision/pages/page-two/page-two.ts new file mode 100644 index 0000000000..0eca3529d4 --- /dev/null +++ b/src/components/app/test/gesture-collision/pages/page-two/page-two.ts @@ -0,0 +1,29 @@ +import { Component } from '@angular/core'; +import { AlertController, NavController, Refresher } from '../../../../../..'; + +@Component({ + templateUrl: 'page-two.html' +}) +export class PageTwo { + constructor(public navCtrl: NavController, public alertCtrl: AlertController) {} + + presentAlert() { + let alert = this.alertCtrl.create({ + title: 'New Friend!', + message: 'Your friend, Obi wan Kenobi, just accepted your friend request!', + cssClass: 'my-alert', + buttons: ['Ok'] + }); + alert.present(); + } + + goToPageTwo() { + this.navCtrl.push('page-two'); + } + + doRefresh(refresher: Refresher) { + setTimeout(() => { + refresher.complete(); + }, 1000); + } +} diff --git a/src/components/app/test/gestures/app.module.ts b/src/components/app/test/gestures/app.module.ts index 4ed76b17f0..1a8e1a956f 100644 --- a/src/components/app/test/gestures/app.module.ts +++ b/src/components/app/test/gestures/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -27,6 +28,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/app/test/gestures/main.ts b/src/components/app/test/gestures/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/app/test/gestures/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/app/test/typography/app.module.ts b/src/components/app/test/typography/app.module.ts index 089dfd9241..79721a80b8 100644 --- a/src/components/app/test/typography/app.module.ts +++ b/src/components/app/test/typography/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, App } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, App } from '../../../..'; @Component({ @@ -16,6 +17,7 @@ export class E2EApp { E2EApp ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp] diff --git a/src/components/app/test/typography/main.ts b/src/components/app/test/typography/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/app/test/typography/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/badge/test/basic/app/app.component.ts b/src/components/badge/test/basic/app/app.component.ts new file mode 100644 index 0000000000..a356c9ea9b --- /dev/null +++ b/src/components/badge/test/basic/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/badge/test/basic/app/app.module.ts b/src/components/badge/test/basic/app/app.module.ts new file mode 100644 index 0000000000..a4c605fe0d --- /dev/null +++ b/src/components/badge/test/basic/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent, + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/badge/test/basic/app/main.ts b/src/components/badge/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/badge/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/badge/test/basic/e2e.ts b/src/components/badge/test/basic/e2e.ts index 1598470cd9..5096661041 100644 --- a/src/components/badge/test/basic/e2e.ts +++ b/src/components/badge/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should toggle color', function() { element(by.css('.e2eBadgeToggleColor')).click(); diff --git a/src/components/badge/test/basic/main.html b/src/components/badge/test/basic/pages/page-one/page-one.html similarity index 100% rename from src/components/badge/test/basic/main.html rename to src/components/badge/test/basic/pages/page-one/page-one.html diff --git a/src/components/badge/test/basic/pages/page-one/page-one.module.ts b/src/components/badge/test/basic/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/badge/test/basic/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/badge/test/basic/app.module.ts b/src/components/badge/test/basic/pages/page-one/page-one.ts similarity index 57% rename from src/components/badge/test/basic/app.module.ts rename to src/components/badge/test/basic/pages/page-one/page-one.ts index 98eb3a0f88..6e60815b44 100644 --- a/src/components/badge/test/basic/app.module.ts +++ b/src/components/badge/test/basic/pages/page-one/page-one.ts @@ -1,11 +1,10 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Config } from '../../../../../ionic-angular'; - +import { Component } from '@angular/core'; +import { Config } from '../../../../../..'; @Component({ - templateUrl: 'main.html' + templateUrl: 'page-one.html' }) -export class E2EPage { +export class PageOne { dynamicColor = 'primary'; dynamicMode: string; @@ -38,25 +37,3 @@ export class E2EPage { this.toggleMode(); } } - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/anchors/app.module.ts b/src/components/button/test/anchors/app.module.ts deleted file mode 100644 index 352b6be500..0000000000 --- a/src/components/button/test/anchors/app.module.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { NgModule, Component } from '@angular/core'; -import { IonicApp, IonicModule, App } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - btnColor: string; - testingColors = ['primary', 'secondary', 'danger', 'dark']; - testingColorIndex = 0; - - constructor(app: App) { - app.setTitle('Basic Buttons'); - this.chgColor(); - } - - chgColor() { - this.btnColor = this.testingColors[this.testingColorIndex]; - console.log('dynamic btnColor', this.btnColor); - this.testingColorIndex = (this.testingColorIndex >= this.testingColors.length - 1 ? 0 : this.testingColorIndex + 1); - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/anchors/app/app.component.ts b/src/components/button/test/anchors/app/app.component.ts new file mode 100644 index 0000000000..a356c9ea9b --- /dev/null +++ b/src/components/button/test/anchors/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/anchors/app/app.module.ts b/src/components/button/test/anchors/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/anchors/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/anchors/app/main.ts b/src/components/button/test/anchors/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/anchors/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/anchors/main.html b/src/components/button/test/anchors/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/anchors/main.html rename to src/components/button/test/anchors/pages/page-one/page-one.html diff --git a/src/components/button/test/anchors/pages/page-one/page-one.module.ts b/src/components/button/test/anchors/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/anchors/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/anchors/pages/page-one/page-one.ts b/src/components/button/test/anchors/pages/page-one/page-one.ts new file mode 100644 index 0000000000..5b20c1059c --- /dev/null +++ b/src/components/button/test/anchors/pages/page-one/page-one.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; +import { App } from '../../../../../..'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne { + btnColor: string; + testingColors = ['primary', 'secondary', 'danger', 'dark']; + testingColorIndex = 0; + + constructor(app: App) { + app.setTitle('Basic Buttons'); + this.chgColor(); + } + + chgColor() { + this.btnColor = this.testingColors[this.testingColorIndex]; + console.log('dynamic btnColor', this.btnColor); + this.testingColorIndex = (this.testingColorIndex >= this.testingColors.length - 1 ? 0 : this.testingColorIndex + 1); + } +} diff --git a/src/components/button/test/attributes/app/app.component.ts b/src/components/button/test/attributes/app/app.component.ts new file mode 100644 index 0000000000..40cb41e266 --- /dev/null +++ b/src/components/button/test/attributes/app/app.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/attributes/app/app.module.ts b/src/components/button/test/attributes/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/attributes/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/attributes/app/main.ts b/src/components/button/test/attributes/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/attributes/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/attributes/main.html b/src/components/button/test/attributes/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/attributes/main.html rename to src/components/button/test/attributes/pages/page-one/page-one.html diff --git a/src/components/button/test/attributes/pages/page-one/page-one.module.ts b/src/components/button/test/attributes/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/attributes/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/attributes/app.module.ts b/src/components/button/test/attributes/pages/page-one/page-one.ts similarity index 67% rename from src/components/button/test/attributes/app.module.ts rename to src/components/button/test/attributes/pages/page-one/page-one.ts index 58ae61fa9f..385e0255e6 100644 --- a/src/components/button/test/attributes/app.module.ts +++ b/src/components/button/test/attributes/pages/page-one/page-one.ts @@ -1,11 +1,9 @@ -import { NgModule, Component } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - +import { Component } from '@angular/core'; @Component({ - templateUrl: 'main.html' + templateUrl: 'page-one.html' }) -export class E2EPage { +export class PageOne { isFull: boolean = true; isBlock: boolean = true; isBarClear: boolean = true; @@ -49,25 +47,3 @@ export class E2EPage { this.isDark = null; } } - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/basic/app/app.component.ts b/src/components/button/test/basic/app/app.component.ts new file mode 100644 index 0000000000..40cb41e266 --- /dev/null +++ b/src/components/button/test/basic/app/app.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/basic/app/app.module.ts b/src/components/button/test/basic/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/basic/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/basic/app/main.ts b/src/components/button/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/basic/main.html b/src/components/button/test/basic/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/basic/main.html rename to src/components/button/test/basic/pages/page-one/page-one.html diff --git a/src/components/button/test/basic/pages/page-one/page-one.module.ts b/src/components/button/test/basic/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..8e020133cc --- /dev/null +++ b/src/components/button/test/basic/pages/page-one/page-one.module.ts @@ -0,0 +1,18 @@ + +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/basic/app.module.ts b/src/components/button/test/basic/pages/page-one/page-one.ts similarity index 53% rename from src/components/button/test/basic/app.module.ts rename to src/components/button/test/basic/pages/page-one/page-one.ts index 16803efbc4..413258c479 100644 --- a/src/components/button/test/basic/app.module.ts +++ b/src/components/button/test/basic/pages/page-one/page-one.ts @@ -1,11 +1,10 @@ -import { NgModule, Component } from '@angular/core'; -import { IonicApp, IonicModule, App } from '../../../../../ionic-angular'; - +import { Component } from '@angular/core'; +import { App } from '../../../../../..'; @Component({ - templateUrl: 'main.html' + templateUrl: 'page-one.html' }) -export class E2EPage { +export class PageOne { btnColor: string; testingColors = ['primary', 'secondary', 'danger', 'dark']; testingColorIndex = 0; @@ -25,26 +24,3 @@ export class E2EPage { console.log(`button click from: ${ev.type}, timestamp: ${Date.now()}`); } } - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/block/app.module.ts b/src/components/button/test/block/app.module.ts deleted file mode 100644 index 116da28ed9..0000000000 --- a/src/components/button/test/block/app.module.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - blockButton = true; - - toggleBlock() { - this.blockButton = !this.blockButton; - } -} - - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/block/app/app.component.ts b/src/components/button/test/block/app/app.component.ts new file mode 100644 index 0000000000..6cc7b31a58 --- /dev/null +++ b/src/components/button/test/block/app/app.component.ts @@ -0,0 +1,10 @@ + +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/block/app/app.module.ts b/src/components/button/test/block/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/block/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/block/app/main.ts b/src/components/button/test/block/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/block/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/block/main.html b/src/components/button/test/block/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/block/main.html rename to src/components/button/test/block/pages/page-one/page-one.html diff --git a/src/components/button/test/block/pages/page-one/page-one.module.ts b/src/components/button/test/block/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/block/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/block/pages/page-one/page-one.ts b/src/components/button/test/block/pages/page-one/page-one.ts new file mode 100644 index 0000000000..e835d9db2a --- /dev/null +++ b/src/components/button/test/block/pages/page-one/page-one.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne { + blockButton = true; + + toggleBlock() { + this.blockButton = !this.blockButton; + } +} diff --git a/src/components/button/test/clear/app.module.ts b/src/components/button/test/clear/app.module.ts deleted file mode 100644 index 866d56886d..0000000000 --- a/src/components/button/test/clear/app.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - clearButton = true; - - toggleClear() { - this.clearButton = !this.clearButton; - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/clear/app/app.component.ts b/src/components/button/test/clear/app/app.component.ts new file mode 100644 index 0000000000..6cc7b31a58 --- /dev/null +++ b/src/components/button/test/clear/app/app.component.ts @@ -0,0 +1,10 @@ + +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/clear/app/app.module.ts b/src/components/button/test/clear/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/clear/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/clear/app/main.ts b/src/components/button/test/clear/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/clear/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/clear/main.html b/src/components/button/test/clear/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/clear/main.html rename to src/components/button/test/clear/pages/page-one/page-one.html diff --git a/src/components/button/test/clear/pages/page-one/page-one.module.ts b/src/components/button/test/clear/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/clear/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/clear/pages/page-one/page-one.ts b/src/components/button/test/clear/pages/page-one/page-one.ts new file mode 100644 index 0000000000..475fdf9182 --- /dev/null +++ b/src/components/button/test/clear/pages/page-one/page-one.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne { + clearButton = true; + + toggleClear() { + this.clearButton = !this.clearButton; + } +} diff --git a/src/components/button/test/decorator/app/app.component.ts b/src/components/button/test/decorator/app/app.component.ts new file mode 100644 index 0000000000..6cc7b31a58 --- /dev/null +++ b/src/components/button/test/decorator/app/app.component.ts @@ -0,0 +1,10 @@ + +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/decorator/app/app.module.ts b/src/components/button/test/decorator/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/decorator/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/decorator/app/main.ts b/src/components/button/test/decorator/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/decorator/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/decorator/e2e.ts b/src/components/button/test/decorator/e2e.ts index 3333a33320..e30566d6e0 100644 --- a/src/components/button/test/decorator/e2e.ts +++ b/src/components/button/test/decorator/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should click edit button', function() { element(by.css('.e2eButtonEdit')).click(); diff --git a/src/components/button/test/decorator/main.html b/src/components/button/test/decorator/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/decorator/main.html rename to src/components/button/test/decorator/pages/page-one/page-one.html diff --git a/src/components/button/test/decorator/pages/page-one/page-one.module.ts b/src/components/button/test/decorator/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/decorator/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/decorator/pages/page-one/page-one.ts b/src/components/button/test/decorator/pages/page-one/page-one.ts new file mode 100644 index 0000000000..272cc9f591 --- /dev/null +++ b/src/components/button/test/decorator/pages/page-one/page-one.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne { + strong = false; +} diff --git a/src/components/button/test/dynamic/app/app.component.ts b/src/components/button/test/dynamic/app/app.component.ts new file mode 100644 index 0000000000..6cc7b31a58 --- /dev/null +++ b/src/components/button/test/dynamic/app/app.component.ts @@ -0,0 +1,10 @@ + +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/dynamic/app/app.module.ts b/src/components/button/test/dynamic/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/dynamic/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/dynamic/app/main.ts b/src/components/button/test/dynamic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/dynamic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/dynamic/e2e.ts b/src/components/button/test/dynamic/e2e.ts index 7a6e3ed0e2..56c880efe7 100644 --- a/src/components/button/test/dynamic/e2e.ts +++ b/src/components/button/test/dynamic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should unify buttons', function() { element(by.css('.e2eButtonDynamicUnify')).click(); diff --git a/src/components/button/test/dynamic/main.html b/src/components/button/test/dynamic/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/dynamic/main.html rename to src/components/button/test/dynamic/pages/page-one/page-one.html diff --git a/src/components/button/test/dynamic/pages/page-one/page-one.module.ts b/src/components/button/test/dynamic/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/dynamic/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/dynamic/app.module.ts b/src/components/button/test/dynamic/pages/page-one/page-one.ts similarity index 74% rename from src/components/button/test/dynamic/app.module.ts rename to src/components/button/test/dynamic/pages/page-one/page-one.ts index de03f7f27d..8d0137f474 100644 --- a/src/components/button/test/dynamic/app.module.ts +++ b/src/components/button/test/dynamic/pages/page-one/page-one.ts @@ -1,11 +1,9 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - +import { Component } from '@angular/core'; @Component({ - templateUrl: 'main.html' + templateUrl: 'page-one.html' }) -export class E2EPage { +export class PageOne { isDestructive: boolean; isSecondary: boolean; isCustom: boolean; @@ -70,25 +68,3 @@ export class E2EPage { } } - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/full/app/app.component.ts b/src/components/button/test/full/app/app.component.ts new file mode 100644 index 0000000000..6cc7b31a58 --- /dev/null +++ b/src/components/button/test/full/app/app.component.ts @@ -0,0 +1,10 @@ + +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/full/app/app.module.ts b/src/components/button/test/full/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/full/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/full/app/main.ts b/src/components/button/test/full/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/full/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/full/e2e.ts b/src/components/button/test/full/e2e.ts index 8b13789179..e69de29bb2 100644 --- a/src/components/button/test/full/e2e.ts +++ b/src/components/button/test/full/e2e.ts @@ -1 +0,0 @@ - diff --git a/src/components/button/test/full/main.html b/src/components/button/test/full/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/full/main.html rename to src/components/button/test/full/pages/page-one/page-one.html diff --git a/src/components/button/test/full/pages/page-one/page-one.module.ts b/src/components/button/test/full/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/full/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/full/pages/page-one/page-one.ts b/src/components/button/test/full/pages/page-one/page-one.ts new file mode 100644 index 0000000000..5f33acc44d --- /dev/null +++ b/src/components/button/test/full/pages/page-one/page-one.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne {} diff --git a/src/components/button/test/icons/app/app.component.ts b/src/components/button/test/icons/app/app.component.ts new file mode 100644 index 0000000000..6cc7b31a58 --- /dev/null +++ b/src/components/button/test/icons/app/app.component.ts @@ -0,0 +1,10 @@ + +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/icons/app/app.module.ts b/src/components/button/test/icons/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/icons/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/icons/app/main.ts b/src/components/button/test/icons/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/icons/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/icons/main.html b/src/components/button/test/icons/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/icons/main.html rename to src/components/button/test/icons/pages/page-one/page-one.html diff --git a/src/components/button/test/icons/pages/page-one/page-one.module.ts b/src/components/button/test/icons/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/icons/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/icons/pages/page-one/page-one.ts b/src/components/button/test/icons/pages/page-one/page-one.ts new file mode 100644 index 0000000000..5f33acc44d --- /dev/null +++ b/src/components/button/test/icons/pages/page-one/page-one.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne {} diff --git a/src/components/button/test/outline/app.module.ts b/src/components/button/test/outline/app.module.ts deleted file mode 100644 index 73255928f3..0000000000 --- a/src/components/button/test/outline/app.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - outlineButton = true; - - toggleOutline() { - this.outlineButton = !this.outlineButton; - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/outline/app/app.component.ts b/src/components/button/test/outline/app/app.component.ts new file mode 100644 index 0000000000..6cc7b31a58 --- /dev/null +++ b/src/components/button/test/outline/app/app.component.ts @@ -0,0 +1,10 @@ + +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/outline/app/app.module.ts b/src/components/button/test/outline/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/outline/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/outline/app/main.ts b/src/components/button/test/outline/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/outline/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/outline/e2e.ts b/src/components/button/test/outline/e2e.ts index 8b13789179..e69de29bb2 100644 --- a/src/components/button/test/outline/e2e.ts +++ b/src/components/button/test/outline/e2e.ts @@ -1 +0,0 @@ - diff --git a/src/components/button/test/outline/main.html b/src/components/button/test/outline/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/outline/main.html rename to src/components/button/test/outline/pages/page-one/page-one.html diff --git a/src/components/button/test/outline/pages/page-one/page-one.module.ts b/src/components/button/test/outline/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/outline/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/outline/pages/page-one/page-one.ts b/src/components/button/test/outline/pages/page-one/page-one.ts new file mode 100644 index 0000000000..b6be0065a3 --- /dev/null +++ b/src/components/button/test/outline/pages/page-one/page-one.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne { + outlineButton = true; + + toggleOutline() { + this.outlineButton = !this.outlineButton; + } +} diff --git a/src/components/button/test/raised/app.module.ts b/src/components/button/test/raised/app.module.ts index bab981f203..414b660941 100644 --- a/src/components/button/test/raised/app.module.ts +++ b/src/components/button/test/raised/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -20,6 +21,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/button/test/raised/main.ts b/src/components/button/test/raised/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/raised/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/round/app.module.ts b/src/components/button/test/round/app.module.ts deleted file mode 100644 index ab3faaac52..0000000000 --- a/src/components/button/test/round/app.module.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - dynamicColor: string = 'secondary'; - - toggleColor() { - this.dynamicColor = (this.dynamicColor === 'secondary' ? 'danger' : 'secondary'); - } -} - - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/round/app/app.component.ts b/src/components/button/test/round/app/app.component.ts new file mode 100644 index 0000000000..6cc7b31a58 --- /dev/null +++ b/src/components/button/test/round/app/app.component.ts @@ -0,0 +1,10 @@ + +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/round/app/app.module.ts b/src/components/button/test/round/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/round/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/round/app/main.ts b/src/components/button/test/round/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/round/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/round/main.html b/src/components/button/test/round/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/round/main.html rename to src/components/button/test/round/pages/page-one/page-one.html diff --git a/src/components/button/test/round/pages/page-one/page-one.module.ts b/src/components/button/test/round/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/round/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/round/pages/page-one/page-one.ts b/src/components/button/test/round/pages/page-one/page-one.ts new file mode 100644 index 0000000000..15f5ab476d --- /dev/null +++ b/src/components/button/test/round/pages/page-one/page-one.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne { + dynamicColor: string = 'secondary'; + + toggleColor() { + this.dynamicColor = (this.dynamicColor === 'secondary' ? 'danger' : 'secondary'); + } +} diff --git a/src/components/button/test/sizes/app/app.component.ts b/src/components/button/test/sizes/app/app.component.ts new file mode 100644 index 0000000000..6cc7b31a58 --- /dev/null +++ b/src/components/button/test/sizes/app/app.component.ts @@ -0,0 +1,10 @@ + +import { Component } from '@angular/core'; +import { PageOne } from '../pages/page-one/page-one'; + +@Component({ + template: '' +}) +export class AppComponent { + rootPage = PageOne; +} diff --git a/src/components/button/test/sizes/app/app.module.ts b/src/components/button/test/sizes/app/app.module.ts new file mode 100644 index 0000000000..472cd840ec --- /dev/null +++ b/src/components/button/test/sizes/app/app.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { PageOneModule } from '../pages/page-one/page-one.module'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent), + PageOneModule + ], + bootstrap: [IonicApp] +}) +export class AppModule {} diff --git a/src/components/button/test/sizes/app/main.ts b/src/components/button/test/sizes/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/button/test/sizes/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/button/test/sizes/main.html b/src/components/button/test/sizes/pages/page-one/page-one.html similarity index 100% rename from src/components/button/test/sizes/main.html rename to src/components/button/test/sizes/pages/page-one/page-one.html diff --git a/src/components/button/test/sizes/pages/page-one/page-one.module.ts b/src/components/button/test/sizes/pages/page-one/page-one.module.ts new file mode 100644 index 0000000000..4b74bda4c9 --- /dev/null +++ b/src/components/button/test/sizes/pages/page-one/page-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PageOne } from './page-one'; + +@NgModule({ + declarations: [ + PageOne, + ], + imports: [ + DeepLinkModule.forChild(PageOne), + ], + entryComponents: [ + PageOne, + ] +}) +export class PageOneModule {} diff --git a/src/components/button/test/sizes/pages/page-one/page-one.ts b/src/components/button/test/sizes/pages/page-one/page-one.ts new file mode 100644 index 0000000000..bf8f9dad76 --- /dev/null +++ b/src/components/button/test/sizes/pages/page-one/page-one.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'page-one.html' +}) +export class PageOne { +} diff --git a/src/components/card/test/advanced/app.module.ts b/src/components/card/test/advanced/app.module.ts deleted file mode 100644 index bab981f203..0000000000 --- a/src/components/card/test/advanced/app.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/card/test/advanced/app/app.component.ts b/src/components/card/test/advanced/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/card/test/advanced/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/card/test/advanced/app/app.module.ts b/src/components/card/test/advanced/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/card/test/advanced/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/card/test/advanced/app/main.ts b/src/components/card/test/advanced/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/card/test/advanced/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/card/test/advanced/main.html b/src/components/card/test/advanced/pages/root-page/root-page.html similarity index 100% rename from src/components/card/test/advanced/main.html rename to src/components/card/test/advanced/pages/root-page/root-page.html diff --git a/src/components/card/test/advanced/pages/root-page/root-page.ts b/src/components/card/test/advanced/pages/root-page/root-page.ts new file mode 100644 index 0000000000..ad2786bb21 --- /dev/null +++ b/src/components/card/test/advanced/pages/root-page/root-page.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/card/test/basic/app.module.ts b/src/components/card/test/basic/app.module.ts deleted file mode 100644 index 80bb084034..0000000000 --- a/src/components/card/test/basic/app.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} - diff --git a/src/components/card/test/basic/app/app.component.ts b/src/components/card/test/basic/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/card/test/basic/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/card/test/basic/app/app.module.ts b/src/components/card/test/basic/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/card/test/basic/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/card/test/basic/app/main.ts b/src/components/card/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/card/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/card/test/basic/main.html b/src/components/card/test/basic/pages/root-page/root-page.html similarity index 100% rename from src/components/card/test/basic/main.html rename to src/components/card/test/basic/pages/root-page/root-page.html diff --git a/src/components/card/test/basic/pages/root-page/root-page.ts b/src/components/card/test/basic/pages/root-page/root-page.ts new file mode 100644 index 0000000000..ad2786bb21 --- /dev/null +++ b/src/components/card/test/basic/pages/root-page/root-page.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/card/test/colors/app.module.ts b/src/components/card/test/colors/app.module.ts deleted file mode 100644 index bab981f203..0000000000 --- a/src/components/card/test/colors/app.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/card/test/colors/app/app.component.ts b/src/components/card/test/colors/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/card/test/colors/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/card/test/colors/app/app.module.ts b/src/components/card/test/colors/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/card/test/colors/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/card/test/colors/app/main.ts b/src/components/card/test/colors/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/card/test/colors/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/card/test/colors/main.html b/src/components/card/test/colors/pages/root-page/root-page.html similarity index 100% rename from src/components/card/test/colors/main.html rename to src/components/card/test/colors/pages/root-page/root-page.html diff --git a/src/components/card/test/colors/pages/root-page/root-page.ts b/src/components/card/test/colors/pages/root-page/root-page.ts new file mode 100644 index 0000000000..ad2786bb21 --- /dev/null +++ b/src/components/card/test/colors/pages/root-page/root-page.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/card/test/images/app.module.ts b/src/components/card/test/images/app.module.ts deleted file mode 100644 index 80bb084034..0000000000 --- a/src/components/card/test/images/app.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} - diff --git a/src/components/card/test/images/app/app.component.ts b/src/components/card/test/images/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/card/test/images/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/card/test/images/app/app.module.ts b/src/components/card/test/images/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/card/test/images/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/card/test/images/app/main.ts b/src/components/card/test/images/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/card/test/images/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/card/test/images/main.html b/src/components/card/test/images/pages/root-page/root-page.html similarity index 100% rename from src/components/card/test/images/main.html rename to src/components/card/test/images/pages/root-page/root-page.html diff --git a/src/components/card/test/images/pages/root-page/root-page.ts b/src/components/card/test/images/pages/root-page/root-page.ts new file mode 100644 index 0000000000..ad2786bb21 --- /dev/null +++ b/src/components/card/test/images/pages/root-page/root-page.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/card/test/list/app.module.ts b/src/components/card/test/list/app.module.ts deleted file mode 100644 index bab981f203..0000000000 --- a/src/components/card/test/list/app.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/card/test/list/app/app.component.ts b/src/components/card/test/list/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/card/test/list/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/card/test/list/app/app.module.ts b/src/components/card/test/list/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/card/test/list/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/card/test/list/app/main.ts b/src/components/card/test/list/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/card/test/list/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/card/test/list/main.html b/src/components/card/test/list/pages/root-page/root-page.html similarity index 100% rename from src/components/card/test/list/main.html rename to src/components/card/test/list/pages/root-page/root-page.html diff --git a/src/components/card/test/list/pages/root-page/root-page.ts b/src/components/card/test/list/pages/root-page/root-page.ts new file mode 100644 index 0000000000..ad2786bb21 --- /dev/null +++ b/src/components/card/test/list/pages/root-page/root-page.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/card/test/map/app.module.ts b/src/components/card/test/map/app.module.ts index bab981f203..414b660941 100644 --- a/src/components/card/test/map/app.module.ts +++ b/src/components/card/test/map/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -20,6 +21,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/card/test/map/main.ts b/src/components/card/test/map/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/card/test/map/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/card/test/social/app.module.ts b/src/components/card/test/social/app.module.ts index bab981f203..414b660941 100644 --- a/src/components/card/test/social/app.module.ts +++ b/src/components/card/test/social/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -20,6 +21,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/card/test/social/main.ts b/src/components/card/test/social/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/card/test/social/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/checkbox/test/basic/app/app.component.ts b/src/components/checkbox/test/basic/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/checkbox/test/basic/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/checkbox/test/basic/app/app.module.ts b/src/components/checkbox/test/basic/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/checkbox/test/basic/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/checkbox/test/basic/app/main.ts b/src/components/checkbox/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/checkbox/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/checkbox/test/basic/e2e.ts b/src/components/checkbox/test/basic/e2e.ts index bbf32ab57e..243870e348 100644 --- a/src/components/checkbox/test/basic/e2e.ts +++ b/src/components/checkbox/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should check apple, enable/check grape, submit form', function() { element(by.css('[formControlName=apple]')).click(); diff --git a/src/components/checkbox/test/basic/main.html b/src/components/checkbox/test/basic/pages/root-page/root-page.html similarity index 100% rename from src/components/checkbox/test/basic/main.html rename to src/components/checkbox/test/basic/pages/root-page/root-page.html diff --git a/src/components/checkbox/test/basic/app.module.ts b/src/components/checkbox/test/basic/pages/root-page/root-page.ts similarity index 74% rename from src/components/checkbox/test/basic/app.module.ts rename to src/components/checkbox/test/basic/pages/root-page/root-page.ts index 58b4291169..6a18a722d3 100644 --- a/src/components/checkbox/test/basic/app.module.ts +++ b/src/components/checkbox/test/basic/pages/root-page/root-page.ts @@ -1,12 +1,13 @@ -import { Component, NgModule } from '@angular/core'; +import { Component } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { IonicApp, IonicModule, Checkbox } from '../../../../../ionic-angular'; + +import { Checkbox } from '../../../../../../'; @Component({ - templateUrl: 'main.html' + templateUrl: 'root-page.html' }) -export class E2EPage { +export class RootPage { grapeDisabled: boolean; grapeChecked: boolean; kiwiValue: boolean; @@ -59,26 +60,3 @@ export class E2EPage { ev.preventDefault(); } } - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} - diff --git a/src/components/chip/test/basic/app.module.ts b/src/components/chip/test/basic/app.module.ts deleted file mode 100644 index f603acb51b..0000000000 --- a/src/components/chip/test/basic/app.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - delete(chip: Element) { - chip.remove(); - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/chip/test/basic/app/app.component.ts b/src/components/chip/test/basic/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/chip/test/basic/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/chip/test/basic/app/app.module.ts b/src/components/chip/test/basic/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/chip/test/basic/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/chip/test/basic/app/main.ts b/src/components/chip/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/chip/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/chip/test/basic/main.html b/src/components/chip/test/basic/pages/root-page/root-page.html similarity index 100% rename from src/components/chip/test/basic/main.html rename to src/components/chip/test/basic/pages/root-page/root-page.html diff --git a/src/components/chip/test/basic/pages/root-page/root-page.ts b/src/components/chip/test/basic/pages/root-page/root-page.ts new file mode 100644 index 0000000000..4defff3a88 --- /dev/null +++ b/src/components/chip/test/basic/pages/root-page/root-page.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + delete(chip: Element) { + chip.remove(); + } +} diff --git a/src/components/content/test/basic/app.module.ts b/src/components/content/test/basic/app.module.ts deleted file mode 100644 index 02855711e2..0000000000 --- a/src/components/content/test/basic/app.module.ts +++ /dev/null @@ -1,98 +0,0 @@ -import { Component, NgModule, ViewChild } from '@angular/core'; -import { IonicApp, IonicModule, Content, ScrollEvent } from '../../../../../ionic-angular'; - -@Component({ - templateUrl: 'tabs.html' -}) -export class TabsPage { - main = E2EPage; - page1 = Page1; - page2 = Page2; - page3 = Page3; - page4 = Page4; -} - - -@Component({ - templateUrl: 'page4.html' -}) -export class Page4 { - tabsPage = TabsPage; -} - - -@Component({ - templateUrl: 'page3.html' -}) -export class Page3 { - page4 = Page4; -} - - -@Component({ - templateUrl: 'page2.html' -}) -export class Page2 { - page3 = Page3; -} - - -@Component({ - templateUrl: 'page1.html' -}) -export class Page1 { - page2 = Page2; -} - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - @ViewChild(Content) content: Content; - page1 = Page1; - showToolbar: boolean = false; - - onScroll(ev: ScrollEvent) { - console.log(`scroll move: scrollTop: ${ev.scrollTop}, directionY: ${ev.directionY}, velocityY: ${ev.velocityY}`); - } - - toggleToolbar() { - this.showToolbar = !this.showToolbar; - this.content.resize(); - } -} - - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage, - TabsPage, - Page1, - Page2, - Page3, - Page4 - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage, - TabsPage, - Page1, - Page2, - Page3, - Page4 - ] -}) -export class AppModule {} diff --git a/src/components/content/test/basic/app/app.component.ts b/src/components/content/test/basic/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/content/test/basic/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/content/test/basic/app/app.module.ts b/src/components/content/test/basic/app/app.module.ts new file mode 100644 index 0000000000..012e962583 --- /dev/null +++ b/src/components/content/test/basic/app/app.module.ts @@ -0,0 +1,42 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { Page1 } from '../pages/page1/page1'; +import { Page2 } from '../pages/page2/page2'; +import { Page3 } from '../pages/page3/page3'; +import { Page4 } from '../pages/page4/page4'; +import { RootPage } from '../pages/root-page/root-page'; +import { TabsPage } from '../pages/tabs/tabs'; + + +@NgModule({ + declarations: [ + AppComponent, + Page1, + Page2, + Page3, + Page4, + RootPage, + TabsPage, + RootPage, + TabsPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + Page1, + Page2, + Page3, + Page4, + RootPage, + TabsPage, + RootPage, + TabsPage + ] +}) +export class AppModule {} diff --git a/src/components/content/test/basic/app/main.ts b/src/components/content/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/content/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/content/test/basic/page1.html b/src/components/content/test/basic/pages/page1/page1.html similarity index 100% rename from src/components/content/test/basic/page1.html rename to src/components/content/test/basic/pages/page1/page1.html diff --git a/src/components/content/test/basic/pages/page1/page1.ts b/src/components/content/test/basic/pages/page1/page1.ts new file mode 100644 index 0000000000..6b45fe8f45 --- /dev/null +++ b/src/components/content/test/basic/pages/page1/page1.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +import { Page2 } from '../page2/page2'; + + +@Component({ + templateUrl: 'page1.html' +}) +export class Page1 { + page2 = Page2; +} diff --git a/src/components/content/test/basic/page2.html b/src/components/content/test/basic/pages/page2/page2.html similarity index 100% rename from src/components/content/test/basic/page2.html rename to src/components/content/test/basic/pages/page2/page2.html diff --git a/src/components/content/test/basic/pages/page2/page2.ts b/src/components/content/test/basic/pages/page2/page2.ts new file mode 100644 index 0000000000..043ea25bd5 --- /dev/null +++ b/src/components/content/test/basic/pages/page2/page2.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +import { Page3 } from '../page3/page3'; + + +@Component({ + templateUrl: 'page2.html' +}) +export class Page2 { + page3 = Page3; +} diff --git a/src/components/content/test/basic/page3.html b/src/components/content/test/basic/pages/page3/page3.html similarity index 100% rename from src/components/content/test/basic/page3.html rename to src/components/content/test/basic/pages/page3/page3.html diff --git a/src/components/content/test/basic/pages/page3/page3.ts b/src/components/content/test/basic/pages/page3/page3.ts new file mode 100644 index 0000000000..1be9147b96 --- /dev/null +++ b/src/components/content/test/basic/pages/page3/page3.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +import { Page4 } from '../page4/page4'; + + +@Component({ + templateUrl: 'page3.html' +}) +export class Page3 { + page4 = Page4; +} diff --git a/src/components/content/test/basic/page4.html b/src/components/content/test/basic/pages/page4/page4.html similarity index 100% rename from src/components/content/test/basic/page4.html rename to src/components/content/test/basic/pages/page4/page4.html diff --git a/src/components/content/test/basic/pages/page4/page4.ts b/src/components/content/test/basic/pages/page4/page4.ts new file mode 100644 index 0000000000..1516a84e40 --- /dev/null +++ b/src/components/content/test/basic/pages/page4/page4.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +import { TabsPage } from '../tabs/tabs'; + + +@Component({ + templateUrl: 'page4.html' +}) +export class Page4 { + tabsPage = TabsPage; +} diff --git a/src/components/content/test/basic/main.html b/src/components/content/test/basic/pages/root-page/root-page.html similarity index 100% rename from src/components/content/test/basic/main.html rename to src/components/content/test/basic/pages/root-page/root-page.html diff --git a/src/components/content/test/basic/pages/root-page/root-page.ts b/src/components/content/test/basic/pages/root-page/root-page.ts new file mode 100644 index 0000000000..ef3df29da0 --- /dev/null +++ b/src/components/content/test/basic/pages/root-page/root-page.ts @@ -0,0 +1,24 @@ +import { Component, ViewChild } from '@angular/core'; + +import { Content, ScrollEvent } from '../../../../../../'; + +import { Page1 } from '../page1/page1'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + @ViewChild(Content) content: Content; + page1 = Page1; + showToolbar: boolean = false; + + onScroll(ev: ScrollEvent) { + console.log(`scroll move: scrollTop: ${ev.scrollTop}, directionY: ${ev.directionY}, velocityY: ${ev.velocityY}`); + } + + toggleToolbar() { + this.showToolbar = !this.showToolbar; + this.content.resize(); + } +} diff --git a/src/components/content/test/basic/tabs.html b/src/components/content/test/basic/pages/tabs/tabs.html similarity index 80% rename from src/components/content/test/basic/tabs.html rename to src/components/content/test/basic/pages/tabs/tabs.html index c1b6656fff..3e5bb0626f 100644 --- a/src/components/content/test/basic/tabs.html +++ b/src/components/content/test/basic/pages/tabs/tabs.html @@ -1,5 +1,5 @@ - + diff --git a/src/components/content/test/basic/pages/tabs/tabs.ts b/src/components/content/test/basic/pages/tabs/tabs.ts new file mode 100644 index 0000000000..54c95977fd --- /dev/null +++ b/src/components/content/test/basic/pages/tabs/tabs.ts @@ -0,0 +1,19 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../root-page/root-page'; +import { Page1 } from '../page1/page1'; +import { Page2 } from '../page2/page2'; +import { Page3 } from '../page3/page3'; +import { Page4 } from '../page4/page4'; + + +@Component({ + templateUrl: 'tabs.html' +}) +export class TabsPage { + rootPage = RootPage; + page1 = Page1; + page2 = Page2; + page3 = Page3; + page4 = Page4; +} diff --git a/src/components/content/test/fullscreen/app.module.ts b/src/components/content/test/fullscreen/app.module.ts deleted file mode 100644 index 62f08f963f..0000000000 --- a/src/components/content/test/fullscreen/app.module.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, ScrollEvent } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'tabs.html' -}) -export class TabsPage { - main = E2EPage; - page1 = Page1; - page2 = Page2; - page3 = Page3; - page4 = Page4; -} - - -@Component({ - templateUrl: 'page4.html' -}) -export class Page4 { - tabsPage = TabsPage; -} - - -@Component({ - templateUrl: 'page3.html' -}) -export class Page3 { - page4 = Page4; -} - - -@Component({ - templateUrl: 'page2.html' -}) -export class Page2 { - page3 = Page3; -} - - -@Component({ - templateUrl: 'page1.html' -}) -export class Page1 { - page2 = Page2; -} - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - page1 = Page1; - - onScrollStart(ev: ScrollEvent) { - console.log(`scroll start: scrollTop: ${ev.scrollTop}, directionY: ${ev.directionY}`); - } - - onScroll(ev: ScrollEvent) { - console.log(`scroll move: scrollTop: ${ev.scrollTop}, directionY: ${ev.directionY}, velocityY: ${ev.velocityY}`); - } - - onScrollEnd(ev: ScrollEvent) { - console.log(`scroll end: scrollTop: ${ev.scrollTop}, directionY: ${ev.directionY}`); - } -} - - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage, - TabsPage, - Page1, - Page2, - Page3, - Page4 - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage, - TabsPage, - Page1, - Page2, - Page3, - Page4 - ] -}) -export class AppModule {} diff --git a/src/components/content/test/fullscreen/app/app.component.ts b/src/components/content/test/fullscreen/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/content/test/fullscreen/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/content/test/fullscreen/app/app.module.ts b/src/components/content/test/fullscreen/app/app.module.ts new file mode 100644 index 0000000000..012e962583 --- /dev/null +++ b/src/components/content/test/fullscreen/app/app.module.ts @@ -0,0 +1,42 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { Page1 } from '../pages/page1/page1'; +import { Page2 } from '../pages/page2/page2'; +import { Page3 } from '../pages/page3/page3'; +import { Page4 } from '../pages/page4/page4'; +import { RootPage } from '../pages/root-page/root-page'; +import { TabsPage } from '../pages/tabs/tabs'; + + +@NgModule({ + declarations: [ + AppComponent, + Page1, + Page2, + Page3, + Page4, + RootPage, + TabsPage, + RootPage, + TabsPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + Page1, + Page2, + Page3, + Page4, + RootPage, + TabsPage, + RootPage, + TabsPage + ] +}) +export class AppModule {} diff --git a/src/components/content/test/fullscreen/app/main.ts b/src/components/content/test/fullscreen/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/content/test/fullscreen/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/content/test/fullscreen/page1.html b/src/components/content/test/fullscreen/pages/page1/page1.html similarity index 100% rename from src/components/content/test/fullscreen/page1.html rename to src/components/content/test/fullscreen/pages/page1/page1.html diff --git a/src/components/content/test/fullscreen/pages/page1/page1.ts b/src/components/content/test/fullscreen/pages/page1/page1.ts new file mode 100644 index 0000000000..6b45fe8f45 --- /dev/null +++ b/src/components/content/test/fullscreen/pages/page1/page1.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +import { Page2 } from '../page2/page2'; + + +@Component({ + templateUrl: 'page1.html' +}) +export class Page1 { + page2 = Page2; +} diff --git a/src/components/content/test/fullscreen/page2.html b/src/components/content/test/fullscreen/pages/page2/page2.html similarity index 100% rename from src/components/content/test/fullscreen/page2.html rename to src/components/content/test/fullscreen/pages/page2/page2.html diff --git a/src/components/content/test/fullscreen/pages/page2/page2.ts b/src/components/content/test/fullscreen/pages/page2/page2.ts new file mode 100644 index 0000000000..043ea25bd5 --- /dev/null +++ b/src/components/content/test/fullscreen/pages/page2/page2.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +import { Page3 } from '../page3/page3'; + + +@Component({ + templateUrl: 'page2.html' +}) +export class Page2 { + page3 = Page3; +} diff --git a/src/components/content/test/fullscreen/page3.html b/src/components/content/test/fullscreen/pages/page3/page3.html similarity index 100% rename from src/components/content/test/fullscreen/page3.html rename to src/components/content/test/fullscreen/pages/page3/page3.html diff --git a/src/components/content/test/fullscreen/pages/page3/page3.ts b/src/components/content/test/fullscreen/pages/page3/page3.ts new file mode 100644 index 0000000000..1be9147b96 --- /dev/null +++ b/src/components/content/test/fullscreen/pages/page3/page3.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +import { Page4 } from '../page4/page4'; + + +@Component({ + templateUrl: 'page3.html' +}) +export class Page3 { + page4 = Page4; +} diff --git a/src/components/content/test/fullscreen/page4.html b/src/components/content/test/fullscreen/pages/page4/page4.html similarity index 100% rename from src/components/content/test/fullscreen/page4.html rename to src/components/content/test/fullscreen/pages/page4/page4.html diff --git a/src/components/content/test/fullscreen/pages/page4/page4.ts b/src/components/content/test/fullscreen/pages/page4/page4.ts new file mode 100644 index 0000000000..1516a84e40 --- /dev/null +++ b/src/components/content/test/fullscreen/pages/page4/page4.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +import { TabsPage } from '../tabs/tabs'; + + +@Component({ + templateUrl: 'page4.html' +}) +export class Page4 { + tabsPage = TabsPage; +} diff --git a/src/components/content/test/fullscreen/main.html b/src/components/content/test/fullscreen/pages/root-page/root-page.html similarity index 100% rename from src/components/content/test/fullscreen/main.html rename to src/components/content/test/fullscreen/pages/root-page/root-page.html diff --git a/src/components/content/test/fullscreen/pages/root-page/root-page.ts b/src/components/content/test/fullscreen/pages/root-page/root-page.ts new file mode 100644 index 0000000000..ef3df29da0 --- /dev/null +++ b/src/components/content/test/fullscreen/pages/root-page/root-page.ts @@ -0,0 +1,24 @@ +import { Component, ViewChild } from '@angular/core'; + +import { Content, ScrollEvent } from '../../../../../../'; + +import { Page1 } from '../page1/page1'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + @ViewChild(Content) content: Content; + page1 = Page1; + showToolbar: boolean = false; + + onScroll(ev: ScrollEvent) { + console.log(`scroll move: scrollTop: ${ev.scrollTop}, directionY: ${ev.directionY}, velocityY: ${ev.velocityY}`); + } + + toggleToolbar() { + this.showToolbar = !this.showToolbar; + this.content.resize(); + } +} diff --git a/src/components/content/test/fullscreen/tabs.html b/src/components/content/test/fullscreen/pages/tabs/tabs.html similarity index 80% rename from src/components/content/test/fullscreen/tabs.html rename to src/components/content/test/fullscreen/pages/tabs/tabs.html index c1b6656fff..40fda6885f 100644 --- a/src/components/content/test/fullscreen/tabs.html +++ b/src/components/content/test/fullscreen/pages/tabs/tabs.html @@ -1,5 +1,5 @@ - + diff --git a/src/components/content/test/fullscreen/pages/tabs/tabs.ts b/src/components/content/test/fullscreen/pages/tabs/tabs.ts new file mode 100644 index 0000000000..54c95977fd --- /dev/null +++ b/src/components/content/test/fullscreen/pages/tabs/tabs.ts @@ -0,0 +1,19 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../root-page/root-page'; +import { Page1 } from '../page1/page1'; +import { Page2 } from '../page2/page2'; +import { Page3 } from '../page3/page3'; +import { Page4 } from '../page4/page4'; + + +@Component({ + templateUrl: 'tabs.html' +}) +export class TabsPage { + rootPage = RootPage; + page1 = Page1; + page2 = Page2; + page3 = Page3; + page4 = Page4; +} diff --git a/src/components/content/test/header-scroll/app.module.ts b/src/components/content/test/header-scroll/app.module.ts index dfd57cfa32..e05c9e9c72 100644 --- a/src/components/content/test/header-scroll/app.module.ts +++ b/src/components/content/test/header-scroll/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, ScrollEvent } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, ScrollEvent } from '../../../..'; @Component({ @@ -31,6 +32,7 @@ export class E2EApp { E2EPage, ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/content/test/header-scroll/main.ts b/src/components/content/test/header-scroll/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/content/test/header-scroll/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/content/test/no-bounce/app.module.ts b/src/components/content/test/no-bounce/app.module.ts index ce9f7a3be7..f9d98fceb2 100644 --- a/src/components/content/test/no-bounce/app.module.ts +++ b/src/components/content/test/no-bounce/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -21,6 +22,7 @@ export class E2EApp { E2EPage, ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/content/test/no-bounce/main.ts b/src/components/content/test/no-bounce/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/content/test/no-bounce/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/datetime/test/basic/app/app.component.ts b/src/components/datetime/test/basic/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/datetime/test/basic/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/datetime/test/basic/app/app.module.ts b/src/components/datetime/test/basic/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/datetime/test/basic/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/datetime/test/basic/app/main.ts b/src/components/datetime/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/datetime/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/datetime/test/basic/e2e.ts b/src/components/datetime/test/basic/e2e.ts index 62a3507105..70da4fddbe 100644 --- a/src/components/datetime/test/basic/e2e.ts +++ b/src/components/datetime/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open basic datetime picker', function() { element(by.css('.e2eOpenMMDDYYYY')).click(); diff --git a/src/components/datetime/test/basic/main.html b/src/components/datetime/test/basic/pages/root-page/root-page.html similarity index 100% rename from src/components/datetime/test/basic/main.html rename to src/components/datetime/test/basic/pages/root-page/root-page.html diff --git a/src/components/datetime/test/basic/app.module.ts b/src/components/datetime/test/basic/pages/root-page/root-page.ts similarity index 63% rename from src/components/datetime/test/basic/app.module.ts rename to src/components/datetime/test/basic/pages/root-page/root-page.ts index b39fe79dc6..cfdd366793 100644 --- a/src/components/datetime/test/basic/app.module.ts +++ b/src/components/datetime/test/basic/pages/root-page/root-page.ts @@ -1,12 +1,10 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - +import { Component } from '@angular/core'; @Component({ - templateUrl: 'main.html' + templateUrl: 'root-page.html' }) -export class E2EPage { +export class RootPage { myDate: any; monthOnly = '2012-12-15T13:47:20.789'; wwwInvented = '1989'; @@ -47,28 +45,4 @@ export class E2EPage { convertDate() { this.convertedDate = new Date(this.myDate).toISOString(); } - } - - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/datetime/test/datetime.spec.ts b/src/components/datetime/test/datetime.spec.ts index f3120b26eb..282ef3fabc 100644 --- a/src/components/datetime/test/datetime.spec.ts +++ b/src/components/datetime/test/datetime.spec.ts @@ -1,7 +1,8 @@ import { DateTime } from '../datetime'; import { Form } from '../../../util/form'; -import { Picker, PickerController } from '../../picker/picker'; +import { Picker } from '../../picker/picker'; +import { PickerController } from '../../picker/picker-controller'; import * as datetime from '../../../util/datetime-util'; import { mockApp, mockConfig, mockElementRef, mockRenderer } from '../../../util/mock-providers'; @@ -14,7 +15,7 @@ describe('DateTime', () => { datetime.max = '2001-12-15'; datetime.min = '2000-01-15'; datetime.pickerFormat = 'MM DD YYYY'; - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -44,7 +45,7 @@ describe('DateTime', () => { datetime.max = '2010-11-15'; datetime.min = '2000-02-15'; datetime.pickerFormat = 'MM DD YYYY'; - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -72,7 +73,7 @@ describe('DateTime', () => { datetime.min = '2000-01-01'; datetime.pickerFormat = 'MM DD YYYY'; - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -112,7 +113,7 @@ describe('DateTime', () => { datetime.pickerFormat = 'MM DD YYYY'; - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -169,7 +170,7 @@ describe('DateTime', () => { datetime.ngAfterContentInit(); datetime.setValue('1994-12-15T13:47:20.789Z'); - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -185,7 +186,7 @@ describe('DateTime', () => { datetime.displayFormat = 'YYYY'; datetime.setValue('1994-12-15T13:47:20.789Z'); - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -199,7 +200,7 @@ describe('DateTime', () => { datetime.pickerFormat = 'YYYY'; datetime.setValue('1994-12-15T13:47:20.789Z'); - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -213,7 +214,7 @@ describe('DateTime', () => { datetime.pickerFormat = 'MMM YYYY'; datetime.setValue('1994-12-15T13:47:20.789Z'); - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -229,7 +230,7 @@ describe('DateTime', () => { datetime.pickerFormat = 'MMMM YYYY'; datetime.setValue('1994-12-15T13:47:20.789Z'); - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -243,7 +244,7 @@ describe('DateTime', () => { datetime.pickerFormat = 'DDDD D M YYYY'; datetime.setValue('1994-12-15T13:47:20.789Z'); - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -257,7 +258,7 @@ describe('DateTime', () => { datetime.pickerFormat = 'DDDD M YYYY'; datetime.setValue('1994-12-15T13:47:20.789Z'); - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -272,7 +273,7 @@ describe('DateTime', () => { datetime.min = '2000-01-01'; datetime.pickerFormat = 'MM DD YYYY'; - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -295,7 +296,7 @@ describe('DateTime', () => { datetime.min = '2000-01-01'; datetime.pickerFormat = 'YYYY'; - var picker = new Picker(mockApp()); + var picker = new Picker(mockApp(), null, mockConfig()); datetime.generate(picker); var columns = picker.getColumns(); @@ -635,7 +636,8 @@ describe('DateTime', () => { var datetime: DateTime; beforeEach(() => { - datetime = new DateTime(new Form(), mockConfig(), mockElementRef(), mockRenderer(), null, {}); + let pickerCtrl = new PickerController(mockApp(), mockConfig()); + datetime = new DateTime(new Form(), mockConfig(), mockElementRef(), mockRenderer(), null, pickerCtrl); }); console.warn = function(){}; diff --git a/src/components/datetime/test/form/app.module.ts b/src/components/datetime/test/form/app.module.ts index bea993f308..a9f90b19cc 100644 --- a/src/components/datetime/test/form/app.module.ts +++ b/src/components/datetime/test/form/app.module.ts @@ -1,6 +1,7 @@ import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { FormControl, FormGroup } from '@angular/forms'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule } from '../../../..'; @@ -38,6 +39,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/datetime/test/form/main.ts b/src/components/datetime/test/form/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/datetime/test/form/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/datetime/test/labels/app.module.ts b/src/components/datetime/test/labels/app.module.ts deleted file mode 100644 index 60452e4014..0000000000 --- a/src/components/datetime/test/labels/app.module.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - stacked1 = '1994-12-15T13:47:20.789'; - stacked2 = '1994-12-15T13:47:20.789'; - floating1 = '1995-04-15'; - floating2 = '1995-04-15'; - fixed1 = '2002-09-23T15:03:46.789'; - fixed2 = '2002-09-23T15:03:46.789'; - inline1 = '2005-06-17T11:06Z'; - inline2 = '2005-06-17T11:06Z'; -} - - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/datetime/test/labels/app/app.component.ts b/src/components/datetime/test/labels/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/datetime/test/labels/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/datetime/test/labels/app/app.module.ts b/src/components/datetime/test/labels/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/datetime/test/labels/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/datetime/test/labels/app/main.ts b/src/components/datetime/test/labels/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/datetime/test/labels/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/datetime/test/labels/main.html b/src/components/datetime/test/labels/pages/root-page/root-page.html similarity index 100% rename from src/components/datetime/test/labels/main.html rename to src/components/datetime/test/labels/pages/root-page/root-page.html diff --git a/src/components/datetime/test/labels/pages/root-page/root-page.ts b/src/components/datetime/test/labels/pages/root-page/root-page.ts new file mode 100644 index 0000000000..0d1cc6c7a2 --- /dev/null +++ b/src/components/datetime/test/labels/pages/root-page/root-page.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + stacked1 = '1994-12-15T13:47:20.789'; + stacked2 = '1994-12-15T13:47:20.789'; + floating1 = '1995-04-15'; + floating2 = '1995-04-15'; + fixed1 = '2002-09-23T15:03:46.789'; + fixed2 = '2002-09-23T15:03:46.789'; + inline1 = '2005-06-17T11:06Z'; + inline2 = '2005-06-17T11:06Z'; +} diff --git a/src/components/fab/test/basic/app.module.ts b/src/components/fab/test/basic/app.module.ts deleted file mode 100755 index 465e27a574..0000000000 --- a/src/components/fab/test/basic/app.module.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, FabContainer } from '../../../../../ionic-angular'; - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - array: number[] = []; - log: string = ''; - - add() { - this.array.push(1); - this.log += 'add\n'; - } - - clickMainFAB() { - let message = 'Clicked open social menu'; - - console.log(message); - this.log += message + '\n'; - } - - openSocial(network: string, fab: FabContainer) { - let message = 'Share in ' + network; - - console.log(message); - this.log += message + '\n'; - - fab.close(); - } -} - - -@Component({ - template: '' -}) -export class E2EApp { - root: any = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/fab/test/basic/app/app.component.ts b/src/components/fab/test/basic/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/fab/test/basic/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/fab/test/basic/app/app.module.ts b/src/components/fab/test/basic/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/fab/test/basic/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/fab/test/basic/app/main.ts b/src/components/fab/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/fab/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/fab/test/basic/e2e.ts b/src/components/fab/test/basic/e2e.ts index e7ba52c3a4..bcdaa8e0bb 100644 --- a/src/components/fab/test/basic/e2e.ts +++ b/src/components/fab/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open fab lists ', function() { element(by.css('.e2eFabTopRight')).click(); diff --git a/src/components/fab/test/basic/main.html b/src/components/fab/test/basic/pages/root-page/root-page.html old mode 100755 new mode 100644 similarity index 100% rename from src/components/fab/test/basic/main.html rename to src/components/fab/test/basic/pages/root-page/root-page.html diff --git a/src/components/fab/test/basic/pages/root-page/root-page.ts b/src/components/fab/test/basic/pages/root-page/root-page.ts new file mode 100644 index 0000000000..73e77caeee --- /dev/null +++ b/src/components/fab/test/basic/pages/root-page/root-page.ts @@ -0,0 +1,33 @@ +import { Component } from '@angular/core'; + +import { FabContainer } from '../../../../../../'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + array: number[] = []; + log: string = ''; + + add() { + this.array.push(1); + this.log += 'add\n'; + } + + clickMainFAB() { + let message = 'Clicked open social menu'; + + console.log(message); + this.log += message + '\n'; + } + + openSocial(network: string, fab: FabContainer) { + let message = 'Share in ' + network; + + console.log(message); + this.log += message + '\n'; + + fab.close(); + } +} diff --git a/src/components/grid/test/alignment/app.module.ts b/src/components/grid/test/alignment/app.module.ts index 8206363eef..65c5590623 100644 --- a/src/components/grid/test/alignment/app.module.ts +++ b/src/components/grid/test/alignment/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -22,6 +23,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/grid/test/alignment/main.ts b/src/components/grid/test/alignment/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/grid/test/alignment/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/grid/test/basic/app.module.ts b/src/components/grid/test/basic/app.module.ts deleted file mode 100644 index 4686ad4728..0000000000 --- a/src/components/grid/test/basic/app.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage, - E2EApp - ] -}) -export class AppModule {} diff --git a/src/components/grid/test/basic/app/app.component.ts b/src/components/grid/test/basic/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/grid/test/basic/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/grid/test/basic/app/app.module.ts b/src/components/grid/test/basic/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/grid/test/basic/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/grid/test/basic/app/main.ts b/src/components/grid/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/grid/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/grid/test/basic/main.html b/src/components/grid/test/basic/pages/root-page/root-page.html similarity index 100% rename from src/components/grid/test/basic/main.html rename to src/components/grid/test/basic/pages/root-page/root-page.html diff --git a/src/components/grid/test/basic/pages/root-page/root-page.ts b/src/components/grid/test/basic/pages/root-page/root-page.ts new file mode 100644 index 0000000000..ad2786bb21 --- /dev/null +++ b/src/components/grid/test/basic/pages/root-page/root-page.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/grid/test/card/app.module.ts b/src/components/grid/test/card/app.module.ts index 5f02e52663..4eb4b81762 100644 --- a/src/components/grid/test/card/app.module.ts +++ b/src/components/grid/test/card/app.module.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ diff --git a/src/components/grid/test/full/app.module.ts b/src/components/grid/test/full/app.module.ts index 4686ad4728..2f28702124 100644 --- a/src/components/grid/test/full/app.module.ts +++ b/src/components/grid/test/full/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -20,6 +21,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/grid/test/full/main.ts b/src/components/grid/test/full/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/grid/test/full/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/grid/test/responsive/app.module.ts b/src/components/grid/test/responsive/app.module.ts index c2d79c73aa..2fb9814a79 100644 --- a/src/components/grid/test/responsive/app.module.ts +++ b/src/components/grid/test/responsive/app.module.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ diff --git a/src/components/icon/test/basic/app.module.ts b/src/components/icon/test/basic/app.module.ts deleted file mode 100644 index 271dd90d04..0000000000 --- a/src/components/icon/test/basic/app.module.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - homeIcon = 'home'; - isActive = false; - iconIndex = 0; - icons = [ - 'home', - 'star', - 'ios-alert', - 'ios-alert-outline', - 'md-alert', - 'logo-apple' - ]; - btnIcon: string; - dynamicColor: string = 'danger'; - - constructor() { - this.btnIcon = this.icons[0]; - } - - updateIcon() { - this.iconIndex++; - if (this.iconIndex >= this.icons.length) { - this.iconIndex = 0; - } - this.btnIcon = this.icons[this.iconIndex]; - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/icon/test/basic/e2e.ts b/src/components/icon/test/basic/e2e.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/components/img/test/basic/app.module.ts b/src/components/img/test/basic/app.module.ts deleted file mode 100644 index b74f6c3f10..0000000000 --- a/src/components/img/test/basic/app.module.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { Component, Input, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - selector: '', - template: '' -}) -export class MyImg { - @Input() width: any; - @Input() height: any; - @Input() src: any; -} - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - images = [ - { - width: '100', - height: '44', - src: '../img/img/batmobile.jpg' - }, - { - width: '100', - height: '75', - src: '../img/img/knight-rider.jpg' - }, - { - width: '100', - height: '68', - src: '../img/img/general-lee.jpg' - } - ]; - -} - - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - - -@NgModule({ - declarations: [ - E2EApp, - E2EPage, - MyImg - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/img/test/basic/app/app.component.ts b/src/components/img/test/basic/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/img/test/basic/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/img/test/basic/app/app.module.ts b/src/components/img/test/basic/app/app.module.ts new file mode 100644 index 0000000000..cb678aeefc --- /dev/null +++ b/src/components/img/test/basic/app/app.module.ts @@ -0,0 +1,25 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; +import { MyImg } from '../pages/my-img/my-img'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage, + MyImg + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage, + MyImg + ] +}) +export class AppModule {} diff --git a/src/components/img/test/basic/app/main.ts b/src/components/img/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/img/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/img/test/img/bandit.jpg b/src/components/img/test/basic/assets/img/bandit.jpg similarity index 100% rename from src/components/img/test/img/bandit.jpg rename to src/components/img/test/basic/assets/img/bandit.jpg diff --git a/src/components/img/test/img/batmobile.jpg b/src/components/img/test/basic/assets/img/batmobile.jpg similarity index 100% rename from src/components/img/test/img/batmobile.jpg rename to src/components/img/test/basic/assets/img/batmobile.jpg diff --git a/src/components/img/test/img/blues-brothers.jpg b/src/components/img/test/basic/assets/img/blues-brothers.jpg similarity index 100% rename from src/components/img/test/img/blues-brothers.jpg rename to src/components/img/test/basic/assets/img/blues-brothers.jpg diff --git a/src/components/img/test/img/bueller.jpg b/src/components/img/test/basic/assets/img/bueller.jpg similarity index 100% rename from src/components/img/test/img/bueller.jpg rename to src/components/img/test/basic/assets/img/bueller.jpg diff --git a/src/components/img/test/img/delorean.jpg b/src/components/img/test/basic/assets/img/delorean.jpg similarity index 100% rename from src/components/img/test/img/delorean.jpg rename to src/components/img/test/basic/assets/img/delorean.jpg diff --git a/src/components/img/test/img/eleanor.jpg b/src/components/img/test/basic/assets/img/eleanor.jpg similarity index 100% rename from src/components/img/test/img/eleanor.jpg rename to src/components/img/test/basic/assets/img/eleanor.jpg diff --git a/src/components/img/test/img/general-lee.jpg b/src/components/img/test/basic/assets/img/general-lee.jpg similarity index 100% rename from src/components/img/test/img/general-lee.jpg rename to src/components/img/test/basic/assets/img/general-lee.jpg diff --git a/src/components/img/test/img/ghostbusters.jpg b/src/components/img/test/basic/assets/img/ghostbusters.jpg similarity index 100% rename from src/components/img/test/img/ghostbusters.jpg rename to src/components/img/test/basic/assets/img/ghostbusters.jpg diff --git a/src/components/img/test/img/knight-rider.jpg b/src/components/img/test/basic/assets/img/knight-rider.jpg similarity index 100% rename from src/components/img/test/img/knight-rider.jpg rename to src/components/img/test/basic/assets/img/knight-rider.jpg diff --git a/src/components/img/test/img/mirth-mobile.jpg b/src/components/img/test/basic/assets/img/mirth-mobile.jpg similarity index 100% rename from src/components/img/test/img/mirth-mobile.jpg rename to src/components/img/test/basic/assets/img/mirth-mobile.jpg diff --git a/src/components/img/test/basic/pages/my-img/my-img.ts b/src/components/img/test/basic/pages/my-img/my-img.ts new file mode 100644 index 0000000000..e7f3e2e386 --- /dev/null +++ b/src/components/img/test/basic/pages/my-img/my-img.ts @@ -0,0 +1,12 @@ +import { Component, Input } from '@angular/core'; + + +@Component({ + selector: '', + template: '' +}) +export class MyImg { + @Input() width: any; + @Input() height: any; + @Input() src: any; +} diff --git a/src/components/img/test/basic/main.html b/src/components/img/test/basic/pages/root-page/root-page.html similarity index 85% rename from src/components/img/test/basic/main.html rename to src/components/img/test/basic/pages/root-page/root-page.html index 4244d64838..fb9d19dab9 100644 --- a/src/components/img/test/basic/main.html +++ b/src/components/img/test/basic/pages/root-page/root-page.html @@ -26,13 +26,13 @@ - + Loaded Avatar - + @@ -68,13 +68,13 @@ - + Loaded Thumbnail - + @@ -83,7 +83,7 @@
Default ion-img w/in content, display: inline-block. - + has width, height and alt set.
diff --git a/src/components/img/test/basic/pages/root-page/root-page.ts b/src/components/img/test/basic/pages/root-page/root-page.ts new file mode 100644 index 0000000000..cb99b7d611 --- /dev/null +++ b/src/components/img/test/basic/pages/root-page/root-page.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + images = [ + { + width: '100', + height: '44', + src: 'assets/img/batmobile.jpg' + }, + { + width: '100', + height: '75', + src: 'assets/img/knight-rider.jpg' + }, + { + width: '100', + height: '68', + src: 'assets/img/general-lee.jpg' + } + ]; +} diff --git a/src/components/img/test/cards/app.module.ts b/src/components/img/test/cards/app.module.ts index d2a9e507f3..b5000f3f56 100644 --- a/src/components/img/test/cards/app.module.ts +++ b/src/components/img/test/cards/app.module.ts @@ -1,11 +1,12 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ templateUrl: 'main.html' }) export class E2EPage { - items = []; + items: number[] = []; constructor() { for (var i = 0; i < 100; i++) { @@ -29,6 +30,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/img/test/cards/assets/img/bandit.jpg b/src/components/img/test/cards/assets/img/bandit.jpg new file mode 100644 index 0000000000..a8c7ac49df Binary files /dev/null and b/src/components/img/test/cards/assets/img/bandit.jpg differ diff --git a/src/components/img/test/cards/assets/img/batmobile.jpg b/src/components/img/test/cards/assets/img/batmobile.jpg new file mode 100644 index 0000000000..729ef3eda4 Binary files /dev/null and b/src/components/img/test/cards/assets/img/batmobile.jpg differ diff --git a/src/components/img/test/cards/assets/img/blues-brothers.jpg b/src/components/img/test/cards/assets/img/blues-brothers.jpg new file mode 100644 index 0000000000..7085a0a515 Binary files /dev/null and b/src/components/img/test/cards/assets/img/blues-brothers.jpg differ diff --git a/src/components/img/test/cards/assets/img/bueller.jpg b/src/components/img/test/cards/assets/img/bueller.jpg new file mode 100644 index 0000000000..07c8db7ca4 Binary files /dev/null and b/src/components/img/test/cards/assets/img/bueller.jpg differ diff --git a/src/components/img/test/cards/assets/img/delorean.jpg b/src/components/img/test/cards/assets/img/delorean.jpg new file mode 100644 index 0000000000..fd10c011d5 Binary files /dev/null and b/src/components/img/test/cards/assets/img/delorean.jpg differ diff --git a/src/components/img/test/cards/assets/img/eleanor.jpg b/src/components/img/test/cards/assets/img/eleanor.jpg new file mode 100644 index 0000000000..9782a0becb Binary files /dev/null and b/src/components/img/test/cards/assets/img/eleanor.jpg differ diff --git a/src/components/img/test/cards/assets/img/general-lee.jpg b/src/components/img/test/cards/assets/img/general-lee.jpg new file mode 100644 index 0000000000..aefbefe50a Binary files /dev/null and b/src/components/img/test/cards/assets/img/general-lee.jpg differ diff --git a/src/components/img/test/cards/assets/img/ghostbusters.jpg b/src/components/img/test/cards/assets/img/ghostbusters.jpg new file mode 100644 index 0000000000..ee66b3635f Binary files /dev/null and b/src/components/img/test/cards/assets/img/ghostbusters.jpg differ diff --git a/src/components/img/test/cards/assets/img/knight-rider.jpg b/src/components/img/test/cards/assets/img/knight-rider.jpg new file mode 100644 index 0000000000..e2513d54cd Binary files /dev/null and b/src/components/img/test/cards/assets/img/knight-rider.jpg differ diff --git a/src/components/img/test/cards/assets/img/mirth-mobile.jpg b/src/components/img/test/cards/assets/img/mirth-mobile.jpg new file mode 100644 index 0000000000..770c6136cb Binary files /dev/null and b/src/components/img/test/cards/assets/img/mirth-mobile.jpg differ diff --git a/src/components/img/test/cards/main.html b/src/components/img/test/cards/main.html index 437b8d68fe..a00f5691c1 100644 --- a/src/components/img/test/cards/main.html +++ b/src/components/img/test/cards/main.html @@ -15,22 +15,22 @@ - +

Item thumbnail right

ion-img left

- + - +

Item avatar left

ion-img right

Isn't it beautiful.

- + diff --git a/src/components/img/test/cards/main.ts b/src/components/img/test/cards/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/img/test/cards/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/img/test/lazy-load/app.module.ts b/src/components/img/test/lazy-load/app.module.ts index 12a5529ad5..ec7a3d06eb 100644 --- a/src/components/img/test/lazy-load/app.module.ts +++ b/src/components/img/test/lazy-load/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -24,6 +25,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/img/test/lazy-load/assets/img/bandit.jpg b/src/components/img/test/lazy-load/assets/img/bandit.jpg new file mode 100644 index 0000000000..a8c7ac49df Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/bandit.jpg differ diff --git a/src/components/img/test/lazy-load/assets/img/batmobile.jpg b/src/components/img/test/lazy-load/assets/img/batmobile.jpg new file mode 100644 index 0000000000..729ef3eda4 Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/batmobile.jpg differ diff --git a/src/components/img/test/lazy-load/assets/img/blues-brothers.jpg b/src/components/img/test/lazy-load/assets/img/blues-brothers.jpg new file mode 100644 index 0000000000..7085a0a515 Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/blues-brothers.jpg differ diff --git a/src/components/img/test/lazy-load/assets/img/bueller.jpg b/src/components/img/test/lazy-load/assets/img/bueller.jpg new file mode 100644 index 0000000000..07c8db7ca4 Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/bueller.jpg differ diff --git a/src/components/img/test/lazy-load/assets/img/delorean.jpg b/src/components/img/test/lazy-load/assets/img/delorean.jpg new file mode 100644 index 0000000000..fd10c011d5 Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/delorean.jpg differ diff --git a/src/components/img/test/lazy-load/assets/img/eleanor.jpg b/src/components/img/test/lazy-load/assets/img/eleanor.jpg new file mode 100644 index 0000000000..9782a0becb Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/eleanor.jpg differ diff --git a/src/components/img/test/lazy-load/assets/img/general-lee.jpg b/src/components/img/test/lazy-load/assets/img/general-lee.jpg new file mode 100644 index 0000000000..aefbefe50a Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/general-lee.jpg differ diff --git a/src/components/img/test/lazy-load/assets/img/ghostbusters.jpg b/src/components/img/test/lazy-load/assets/img/ghostbusters.jpg new file mode 100644 index 0000000000..ee66b3635f Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/ghostbusters.jpg differ diff --git a/src/components/img/test/lazy-load/assets/img/knight-rider.jpg b/src/components/img/test/lazy-load/assets/img/knight-rider.jpg new file mode 100644 index 0000000000..e2513d54cd Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/knight-rider.jpg differ diff --git a/src/components/img/test/lazy-load/assets/img/mirth-mobile.jpg b/src/components/img/test/lazy-load/assets/img/mirth-mobile.jpg new file mode 100644 index 0000000000..770c6136cb Binary files /dev/null and b/src/components/img/test/lazy-load/assets/img/mirth-mobile.jpg differ diff --git a/src/components/img/test/lazy-load/main.html b/src/components/img/test/lazy-load/main.html index bc35900049..7666c08ddf 100644 --- a/src/components/img/test/lazy-load/main.html +++ b/src/components/img/test/lazy-load/main.html @@ -12,13 +12,13 @@ - + Thumbnail - + @@ -26,13 +26,13 @@ - + Thumbnail - + @@ -40,13 +40,13 @@ - + Thumbnail - + @@ -54,13 +54,13 @@ - + Thumbnail - + @@ -68,13 +68,13 @@ - + Thumbnail - + @@ -82,13 +82,13 @@ - + Thumbnail - + @@ -96,13 +96,13 @@ - + Thumbnail - + @@ -110,13 +110,13 @@ - + Thumbnail - + @@ -124,13 +124,13 @@ - + Thumbnail - + @@ -138,13 +138,13 @@ - + Thumbnail - + @@ -152,13 +152,13 @@ - + Thumbnail - + @@ -166,13 +166,13 @@ - + Thumbnail - + @@ -180,13 +180,13 @@ - + Thumbnail - + @@ -194,13 +194,13 @@ - + Thumbnail - + @@ -208,13 +208,13 @@ - + Thumbnail - + @@ -222,13 +222,13 @@ - + Thumbnail - + @@ -236,13 +236,13 @@ - + Thumbnail - + @@ -250,13 +250,13 @@ - + Thumbnail - + @@ -264,13 +264,13 @@ - + Thumbnail - + @@ -278,13 +278,13 @@ - + Thumbnail - + @@ -292,13 +292,13 @@ - + Thumbnail - + @@ -306,13 +306,13 @@ - + Thumbnail - + @@ -320,13 +320,13 @@ - + Thumbnail - + @@ -334,13 +334,13 @@ - + Thumbnail - + @@ -348,13 +348,13 @@ - + Thumbnail - + @@ -362,13 +362,13 @@ - + Thumbnail - + @@ -376,13 +376,13 @@ - + Thumbnail - + @@ -390,13 +390,13 @@ - + Thumbnail - + @@ -404,13 +404,13 @@ - + Thumbnail - + @@ -418,13 +418,13 @@ - + Thumbnail - + @@ -432,13 +432,13 @@ - + Thumbnail - + @@ -446,13 +446,13 @@ - + Thumbnail - + @@ -460,13 +460,13 @@ - + Thumbnail - + @@ -474,13 +474,13 @@ - + Thumbnail - + @@ -488,13 +488,13 @@ - + Thumbnail - + @@ -502,13 +502,13 @@ - + Thumbnail - + @@ -516,13 +516,13 @@ - + Thumbnail - + @@ -530,13 +530,13 @@ - + Thumbnail - + @@ -544,13 +544,13 @@ - + Thumbnail - + @@ -558,13 +558,13 @@ - + Thumbnail - + @@ -572,13 +572,13 @@ - + Thumbnail - + @@ -586,13 +586,13 @@ - + Thumbnail - + @@ -600,13 +600,13 @@ - + Thumbnail - + @@ -614,13 +614,13 @@ - + Thumbnail - + @@ -628,13 +628,13 @@ - + Thumbnail - + @@ -642,13 +642,13 @@ - + Thumbnail - + @@ -656,13 +656,13 @@ - + Thumbnail - + @@ -670,13 +670,13 @@ - + Thumbnail - + diff --git a/src/components/img/test/lazy-load/main.ts b/src/components/img/test/lazy-load/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/img/test/lazy-load/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/img/test/list/app.module.ts b/src/components/img/test/list/app.module.ts index e18f920af0..1a5d2043f8 100644 --- a/src/components/img/test/list/app.module.ts +++ b/src/components/img/test/list/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -35,7 +36,7 @@ const images = [ function getRandomImg(): string { let imgString = images[Math.floor(Math.random() * images.length)]; - let src = '../img/' + imgString; + let src = 'assets/img/' + imgString; return src; } @@ -54,6 +55,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/img/test/list/assets/img/bandit.jpg b/src/components/img/test/list/assets/img/bandit.jpg new file mode 100644 index 0000000000..a8c7ac49df Binary files /dev/null and b/src/components/img/test/list/assets/img/bandit.jpg differ diff --git a/src/components/img/test/list/assets/img/batmobile.jpg b/src/components/img/test/list/assets/img/batmobile.jpg new file mode 100644 index 0000000000..729ef3eda4 Binary files /dev/null and b/src/components/img/test/list/assets/img/batmobile.jpg differ diff --git a/src/components/img/test/list/assets/img/blues-brothers.jpg b/src/components/img/test/list/assets/img/blues-brothers.jpg new file mode 100644 index 0000000000..7085a0a515 Binary files /dev/null and b/src/components/img/test/list/assets/img/blues-brothers.jpg differ diff --git a/src/components/img/test/list/assets/img/bueller.jpg b/src/components/img/test/list/assets/img/bueller.jpg new file mode 100644 index 0000000000..07c8db7ca4 Binary files /dev/null and b/src/components/img/test/list/assets/img/bueller.jpg differ diff --git a/src/components/img/test/list/assets/img/delorean.jpg b/src/components/img/test/list/assets/img/delorean.jpg new file mode 100644 index 0000000000..fd10c011d5 Binary files /dev/null and b/src/components/img/test/list/assets/img/delorean.jpg differ diff --git a/src/components/img/test/list/assets/img/eleanor.jpg b/src/components/img/test/list/assets/img/eleanor.jpg new file mode 100644 index 0000000000..9782a0becb Binary files /dev/null and b/src/components/img/test/list/assets/img/eleanor.jpg differ diff --git a/src/components/img/test/list/assets/img/general-lee.jpg b/src/components/img/test/list/assets/img/general-lee.jpg new file mode 100644 index 0000000000..aefbefe50a Binary files /dev/null and b/src/components/img/test/list/assets/img/general-lee.jpg differ diff --git a/src/components/img/test/list/assets/img/ghostbusters.jpg b/src/components/img/test/list/assets/img/ghostbusters.jpg new file mode 100644 index 0000000000..ee66b3635f Binary files /dev/null and b/src/components/img/test/list/assets/img/ghostbusters.jpg differ diff --git a/src/components/img/test/list/assets/img/knight-rider.jpg b/src/components/img/test/list/assets/img/knight-rider.jpg new file mode 100644 index 0000000000..e2513d54cd Binary files /dev/null and b/src/components/img/test/list/assets/img/knight-rider.jpg differ diff --git a/src/components/img/test/list/assets/img/mirth-mobile.jpg b/src/components/img/test/list/assets/img/mirth-mobile.jpg new file mode 100644 index 0000000000..770c6136cb Binary files /dev/null and b/src/components/img/test/list/assets/img/mirth-mobile.jpg differ diff --git a/src/components/img/test/list/main.ts b/src/components/img/test/list/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/img/test/list/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/infinite-scroll/test/basic/app.module.ts b/src/components/infinite-scroll/test/basic/app.module.ts index da67d0183f..8ba0675a4e 100644 --- a/src/components/infinite-scroll/test/basic/app.module.ts +++ b/src/components/infinite-scroll/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, InfiniteScroll, NavController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, InfiniteScroll, NavController } from '../../../..'; @Component({ @@ -65,6 +66,7 @@ export class E2EApp { E2EPage2 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/infinite-scroll/test/basic/main.ts b/src/components/infinite-scroll/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/infinite-scroll/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/infinite-scroll/test/short-list/app.module.ts b/src/components/infinite-scroll/test/short-list/app.module.ts index 913555c9fd..69b4f768a3 100644 --- a/src/components/infinite-scroll/test/short-list/app.module.ts +++ b/src/components/infinite-scroll/test/short-list/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, InfiniteScroll } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, InfiniteScroll } from '../../../..'; @Component({ @@ -46,6 +47,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/infinite-scroll/test/short-list/main.ts b/src/components/infinite-scroll/test/short-list/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/infinite-scroll/test/short-list/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/clear-after-edit/app.module.ts b/src/components/input/test/clear-after-edit/app.module.ts deleted file mode 100644 index 4aa005f47f..0000000000 --- a/src/components/input/test/clear-after-edit/app.module.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - myValue = ''; - myValue2 = ''; -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/input/test/clear-after-edit/app/app.component.ts b/src/components/input/test/clear-after-edit/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/input/test/clear-after-edit/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/input/test/clear-after-edit/app/app.module.ts b/src/components/input/test/clear-after-edit/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/input/test/clear-after-edit/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/input/test/clear-after-edit/app/main.ts b/src/components/input/test/clear-after-edit/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/clear-after-edit/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/clear-after-edit/main.html b/src/components/input/test/clear-after-edit/pages/root-page/root-page.html similarity index 100% rename from src/components/input/test/clear-after-edit/main.html rename to src/components/input/test/clear-after-edit/pages/root-page/root-page.html diff --git a/src/components/input/test/clear-after-edit/pages/root-page/root-page.ts b/src/components/input/test/clear-after-edit/pages/root-page/root-page.ts new file mode 100644 index 0000000000..be578a5da9 --- /dev/null +++ b/src/components/input/test/clear-after-edit/pages/root-page/root-page.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + myValue = ''; + myValue2 = ''; +} diff --git a/src/components/input/test/clear-input/app.module.ts b/src/components/input/test/clear-input/app.module.ts deleted file mode 100644 index 314a4b2365..0000000000 --- a/src/components/input/test/clear-input/app.module.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { FormBuilder, Validators } from '@angular/forms'; - -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - userForm: any; - myValue = 'really long value that overflows to show padding'; - - constructor(fb: FormBuilder) { - this.userForm = fb.group({ - username: [{value: '', disabled: false}, Validators.required], - password: [{value: '', disabled: false}, Validators.required], - }); - } - - clicked() { - console.log('clicked button'); - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/input/test/clear-input/app/app.component.ts b/src/components/input/test/clear-input/app/app.component.ts new file mode 100644 index 0000000000..dcf2f9e7e7 --- /dev/null +++ b/src/components/input/test/clear-input/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class AppComponent { + root = RootPage; +} diff --git a/src/components/input/test/clear-input/app/app.module.ts b/src/components/input/test/clear-input/app/app.module.ts new file mode 100644 index 0000000000..a97cc075e4 --- /dev/null +++ b/src/components/input/test/clear-input/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { AppComponent } from './app.component'; +import { RootPage } from '../pages/root-page/root-page'; + +@NgModule({ + declarations: [ + AppComponent, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(AppComponent) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/input/test/clear-input/app/main.ts b/src/components/input/test/clear-input/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/clear-input/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/clear-input/main.html b/src/components/input/test/clear-input/pages/root-page/root-page.html similarity index 100% rename from src/components/input/test/clear-input/main.html rename to src/components/input/test/clear-input/pages/root-page/root-page.html diff --git a/src/components/input/test/clear-input/pages/root-page/root-page.ts b/src/components/input/test/clear-input/pages/root-page/root-page.ts new file mode 100644 index 0000000000..4a3a6c828a --- /dev/null +++ b/src/components/input/test/clear-input/pages/root-page/root-page.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; +import { FormBuilder, Validators } from '@angular/forms'; + + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + userForm: any; + myValue = 'really long value that overflows to show padding'; + + constructor(fb: FormBuilder) { + this.userForm = fb.group({ + username: [{value: '', disabled: false}, Validators.required], + password: [{value: '', disabled: false}, Validators.required], + }); + } + + clicked() { + console.log('clicked button'); + } +} diff --git a/src/components/button/test/full/app.module.ts b/src/components/input/test/events/app/app.module.ts similarity index 57% rename from src/components/button/test/full/app.module.ts rename to src/components/input/test/events/app/app.module.ts index bab981f203..66d6a3950d 100644 --- a/src/components/button/test/full/app.module.ts +++ b/src/components/input/test/events/app/app.module.ts @@ -1,30 +1,28 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} +import { RootPage } from '../pages/root-page/root-page'; @Component({ template: '' }) export class E2EApp { - rootPage = E2EPage; + rootPage = RootPage; } @NgModule({ declarations: [ E2EApp, - E2EPage + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ - E2EPage + RootPage ] }) export class AppModule {} diff --git a/src/components/input/test/events/app/main.ts b/src/components/input/test/events/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/events/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/events/main.html b/src/components/input/test/events/pages/root-page/root-page.html similarity index 100% rename from src/components/input/test/events/main.html rename to src/components/input/test/events/pages/root-page/root-page.html diff --git a/src/components/input/test/events/app.module.ts b/src/components/input/test/events/pages/root-page/root-page.ts similarity index 54% rename from src/components/input/test/events/app.module.ts rename to src/components/input/test/events/pages/root-page/root-page.ts index 9cf89cee86..8f5b17b827 100644 --- a/src/components/input/test/events/app.module.ts +++ b/src/components/input/test/events/pages/root-page/root-page.ts @@ -1,11 +1,10 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, TextInput } from '../../../../../ionic-angular'; - +import { Component } from '@angular/core'; +import { TextInput } from '../../../../../../'; @Component({ - templateUrl: 'main.html' + templateUrl: 'root-page.html' }) -export class E2EPage { +export class RootPage { ngvalue1: any; ngvalue2: any; value2: any; @@ -39,25 +38,3 @@ export class E2EPage { console.log('value6', this.value6); } } - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/input/test/fixed-inline-labels/app.module.ts b/src/components/input/test/fixed-inline-labels/app/app.module.ts similarity index 51% rename from src/components/input/test/fixed-inline-labels/app.module.ts rename to src/components/input/test/fixed-inline-labels/app/app.module.ts index afbb4f9725..a12bc6035d 100644 --- a/src/components/input/test/fixed-inline-labels/app.module.ts +++ b/src/components/input/test/fixed-inline-labels/app/app.module.ts @@ -1,37 +1,28 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../../'; - -@Component({ - templateUrl: 'main.html' -}) -export class PageOne { - url: string; - input1: string = 'Text 1'; - - onEvent(event: any) { - console.log('Did Event:', event.type); - } -} +import { RootPage } from '../pages/root-page/root-page'; @Component({ template: '' }) export class E2EApp { - root = PageOne; + root = RootPage; } @NgModule({ declarations: [ E2EApp, - PageOne + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ - PageOne + RootPage ] }) export class AppModule {} diff --git a/src/components/input/test/fixed-inline-labels/app/main.ts b/src/components/input/test/fixed-inline-labels/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/fixed-inline-labels/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/fixed-inline-labels/main.html b/src/components/input/test/fixed-inline-labels/pages/root-page/root-page.html similarity index 99% rename from src/components/input/test/fixed-inline-labels/main.html rename to src/components/input/test/fixed-inline-labels/pages/root-page/root-page.html index b695ca79e6..cc091d04c4 100644 --- a/src/components/input/test/fixed-inline-labels/main.html +++ b/src/components/input/test/fixed-inline-labels/pages/root-page/root-page.html @@ -93,4 +93,4 @@

{{url}}

- + \ No newline at end of file diff --git a/src/components/input/test/fixed-inline-labels/pages/root-page/root-page.ts b/src/components/input/test/fixed-inline-labels/pages/root-page/root-page.ts new file mode 100644 index 0000000000..0d9a771445 --- /dev/null +++ b/src/components/input/test/fixed-inline-labels/pages/root-page/root-page.ts @@ -0,0 +1,13 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + url: string; + input1: string = 'Text 1'; + + onEvent(event: any) { + console.log('Did Event:', event.type); + } +} diff --git a/src/components/input/test/floating-labels/app.module.ts b/src/components/input/test/floating-labels/app.module.ts deleted file mode 100644 index e42cbcceb3..0000000000 --- a/src/components/input/test/floating-labels/app.module.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - myParam = ''; - minValue = 8; - maxValue = 12; - stepValue = 2; - - myValues = { - value1: 'Dynamic Input', - value2: 'Dynamic Textarea' - }; - - toggleValues() { - this.minValue === 8 ? this.minValue = 4 : this.minValue = 8; - this.maxValue === 12 ? this.maxValue = 20 : this.maxValue = 12; - this.stepValue === 2 ? this.stepValue = 4 : this.stepValue = 2; - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/sizes/app.module.ts b/src/components/input/test/floating-labels/app/app.module.ts similarity index 57% rename from src/components/button/test/sizes/app.module.ts rename to src/components/input/test/floating-labels/app/app.module.ts index 0be0bcd814..b3427e9ee7 100644 --- a/src/components/button/test/sizes/app.module.ts +++ b/src/components/input/test/floating-labels/app/app.module.ts @@ -1,31 +1,28 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../../'; +import { RootPage } from '../pages/root-page/root-page'; @Component({ template: '' }) export class E2EApp { - rootPage = E2EPage; + rootPage = RootPage; } @NgModule({ declarations: [ E2EApp, - E2EPage + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ - E2EPage + RootPage ] }) export class AppModule {} diff --git a/src/components/input/test/floating-labels/app/main.ts b/src/components/input/test/floating-labels/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/floating-labels/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/floating-labels/main.html b/src/components/input/test/floating-labels/pages/root-page/root-page.html similarity index 99% rename from src/components/input/test/floating-labels/main.html rename to src/components/input/test/floating-labels/pages/root-page/root-page.html index 5923538a97..d671dc0106 100644 --- a/src/components/input/test/floating-labels/main.html +++ b/src/components/input/test/floating-labels/pages/root-page/root-page.html @@ -88,4 +88,4 @@ img { height: 100px; } - + \ No newline at end of file diff --git a/src/components/input/test/floating-labels/pages/root-page/root-page.ts b/src/components/input/test/floating-labels/pages/root-page/root-page.ts new file mode 100644 index 0000000000..87356e41d7 --- /dev/null +++ b/src/components/input/test/floating-labels/pages/root-page/root-page.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + myParam = ''; + minValue = 8; + maxValue = 12; + stepValue = 2; + + myValues = { + value1: 'Dynamic Input', + value2: 'Dynamic Textarea' + }; + + toggleValues() { + this.minValue === 8 ? this.minValue = 4 : this.minValue = 8; + this.maxValue === 12 ? this.maxValue = 20 : this.maxValue = 12; + this.stepValue === 2 ? this.stepValue = 4 : this.stepValue = 2; + } +} diff --git a/src/components/input/test/footer-inputs/app.module.ts b/src/components/input/test/footer-inputs/app.module.ts deleted file mode 100644 index e7f896dafc..0000000000 --- a/src/components/input/test/footer-inputs/app.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/decorator/app.module.ts b/src/components/input/test/footer-inputs/app/app.module.ts similarity index 57% rename from src/components/button/test/decorator/app.module.ts rename to src/components/input/test/footer-inputs/app/app.module.ts index 8011313760..66d6a3950d 100644 --- a/src/components/button/test/decorator/app.module.ts +++ b/src/components/input/test/footer-inputs/app/app.module.ts @@ -1,32 +1,28 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - strong = false; -} +import { RootPage } from '../pages/root-page/root-page'; @Component({ template: '' }) export class E2EApp { - rootPage = E2EPage; + rootPage = RootPage; } @NgModule({ declarations: [ E2EApp, - E2EPage + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ - E2EPage + RootPage ] }) export class AppModule {} diff --git a/src/components/input/test/footer-inputs/app/main.ts b/src/components/input/test/footer-inputs/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/footer-inputs/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/footer-inputs/main.html b/src/components/input/test/footer-inputs/pages/root-page/root-page.html similarity index 100% rename from src/components/input/test/footer-inputs/main.html rename to src/components/input/test/footer-inputs/pages/root-page/root-page.html diff --git a/src/components/input/test/footer-inputs/pages/root-page/root-page.ts b/src/components/input/test/footer-inputs/pages/root-page/root-page.ts new file mode 100644 index 0000000000..12a5543e14 --- /dev/null +++ b/src/components/input/test/footer-inputs/pages/root-page/root-page.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { +} diff --git a/src/components/input/test/form-inputs/app/app.module.ts b/src/components/input/test/form-inputs/app/app.module.ts new file mode 100644 index 0000000000..12e205bd1b --- /dev/null +++ b/src/components/input/test/form-inputs/app/app.module.ts @@ -0,0 +1,28 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + root = RootPage; +} + +@NgModule({ + declarations: [ + E2EApp, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/input/test/form-inputs/app/main.ts b/src/components/input/test/form-inputs/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/form-inputs/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/form-inputs/main.html b/src/components/input/test/form-inputs/pages/root-page/root-page.html similarity index 100% rename from src/components/input/test/form-inputs/main.html rename to src/components/input/test/form-inputs/pages/root-page/root-page.html diff --git a/src/components/input/test/form-inputs/app.module.ts b/src/components/input/test/form-inputs/pages/root-page/root-page.ts similarity index 77% rename from src/components/input/test/form-inputs/app.module.ts rename to src/components/input/test/form-inputs/pages/root-page/root-page.ts index 75402e8970..3b1a44bf7f 100644 --- a/src/components/input/test/form-inputs/app.module.ts +++ b/src/components/input/test/form-inputs/pages/root-page/root-page.ts @@ -1,12 +1,10 @@ import { FormBuilder, Validators } from '@angular/forms'; -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - +import { Component } from '@angular/core'; @Component({ - templateUrl: 'main.html' + templateUrl: 'root-page.html' }) -export class E2EPage { +export class RootPage { loginForm: any; userForm: any; @@ -67,25 +65,3 @@ export class E2EPage { } } - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/input/test/stacked-labels/app.module.ts b/src/components/input/test/highlight/app/app.module.ts similarity index 58% rename from src/components/input/test/stacked-labels/app.module.ts rename to src/components/input/test/highlight/app/app.module.ts index 7ec6666177..2bca994a45 100644 --- a/src/components/input/test/stacked-labels/app.module.ts +++ b/src/components/input/test/highlight/app/app.module.ts @@ -1,34 +1,29 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class PageOne { - gender = ''; -} +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; +import { RootPage } from '../pages/root-page/root-page'; @Component({ template: '' }) export class E2EApp { - root = PageOne; + root = RootPage; } @NgModule({ declarations: [ E2EApp, - PageOne + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ E2EApp, - PageOne + RootPage ] }) export class AppModule {} diff --git a/src/components/input/test/highlight/app/main.ts b/src/components/input/test/highlight/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/highlight/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/highlight/main.html b/src/components/input/test/highlight/pages/root-page/root-page.html similarity index 99% rename from src/components/input/test/highlight/main.html rename to src/components/input/test/highlight/pages/root-page/root-page.html index 1c0e267c04..79810dc7c8 100644 --- a/src/components/input/test/highlight/main.html +++ b/src/components/input/test/highlight/pages/root-page/root-page.html @@ -102,4 +102,4 @@ - + \ No newline at end of file diff --git a/src/components/input/test/highlight/app.module.ts b/src/components/input/test/highlight/pages/root-page/root-page.ts similarity index 65% rename from src/components/input/test/highlight/app.module.ts rename to src/components/input/test/highlight/pages/root-page/root-page.ts index 5863dba0ed..ea09d64ffe 100644 --- a/src/components/input/test/highlight/app.module.ts +++ b/src/components/input/test/highlight/pages/root-page/root-page.ts @@ -1,12 +1,10 @@ import { FormBuilder, Validators } from '@angular/forms'; -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - +import { Component } from '@angular/core'; @Component({ - templateUrl: 'main.html' + templateUrl: 'root-page.html' }) -export class E2EPage { +export class RootPage { loginForm: any; login = { @@ -46,26 +44,3 @@ export class E2EPage { } } - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/input/test/inline-labels/app.module.ts b/src/components/input/test/inline-labels/app.module.ts deleted file mode 100644 index 5e4db4a4ed..0000000000 --- a/src/components/input/test/inline-labels/app.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - - submit(ev: any) { - console.debug('submit', ev); - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/button/test/icons/app.module.ts b/src/components/input/test/inline-labels/app/app.module.ts similarity index 57% rename from src/components/button/test/icons/app.module.ts rename to src/components/input/test/inline-labels/app/app.module.ts index bab981f203..66d6a3950d 100644 --- a/src/components/button/test/icons/app.module.ts +++ b/src/components/input/test/inline-labels/app/app.module.ts @@ -1,30 +1,28 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} +import { RootPage } from '../pages/root-page/root-page'; @Component({ template: '' }) export class E2EApp { - rootPage = E2EPage; + rootPage = RootPage; } @NgModule({ declarations: [ E2EApp, - E2EPage + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ - E2EPage + RootPage ] }) export class AppModule {} diff --git a/src/components/input/test/inline-labels/app/main.ts b/src/components/input/test/inline-labels/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/inline-labels/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/inline-labels/main.html b/src/components/input/test/inline-labels/pages/root-page/root-page.html similarity index 99% rename from src/components/input/test/inline-labels/main.html rename to src/components/input/test/inline-labels/pages/root-page/root-page.html index 91c1ade9a0..0eda034436 100644 --- a/src/components/input/test/inline-labels/main.html +++ b/src/components/input/test/inline-labels/pages/root-page/root-page.html @@ -100,4 +100,4 @@ - + \ No newline at end of file diff --git a/src/components/input/test/inline-labels/pages/root-page/root-page.ts b/src/components/input/test/inline-labels/pages/root-page/root-page.ts new file mode 100644 index 0000000000..32a5b25133 --- /dev/null +++ b/src/components/input/test/inline-labels/pages/root-page/root-page.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + + submit(ev: any) { + console.debug('submit', ev); + } +} diff --git a/src/components/input/test/input-focus/app/app.module.ts b/src/components/input/test/input-focus/app/app.module.ts new file mode 100644 index 0000000000..d1bee608f6 --- /dev/null +++ b/src/components/input/test/input-focus/app/app.module.ts @@ -0,0 +1,31 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + rootPage = RootPage; +} + +@NgModule({ + declarations: [ + E2EApp, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp, { + inputCloning: true, + scrollAssist: true + }) + ], + bootstrap: [IonicApp], + entryComponents: [ + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/input/test/input-focus/app/main.ts b/src/components/input/test/input-focus/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/input-focus/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/input-focus/main.html b/src/components/input/test/input-focus/pages/root-page/root-page.html similarity index 99% rename from src/components/input/test/input-focus/main.html rename to src/components/input/test/input-focus/pages/root-page/root-page.html index d6f838d64a..ded444ec43 100644 --- a/src/components/input/test/input-focus/main.html +++ b/src/components/input/test/input-focus/pages/root-page/root-page.html @@ -221,4 +221,4 @@ - + \ No newline at end of file diff --git a/src/components/input/test/input-focus/app.module.ts b/src/components/input/test/input-focus/pages/root-page/root-page.ts similarity index 64% rename from src/components/input/test/input-focus/app.module.ts rename to src/components/input/test/input-focus/pages/root-page/root-page.ts index ba7bd386dd..cafde905d7 100644 --- a/src/components/input/test/input-focus/app.module.ts +++ b/src/components/input/test/input-focus/pages/root-page/root-page.ts @@ -1,11 +1,9 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - +import { Component } from '@angular/core'; @Component({ - templateUrl: 'main.html' + templateUrl: 'root-page.html' }) -export class E2EPage { +export class RootPage { reload() { window.location.reload(); } @@ -32,28 +30,3 @@ document.addEventListener('focusout', (ev: any) => { console.log(`CLICK, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); console.log(`FOCUS OUT, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); }); - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp, { - inputCloning: true, - scrollAssist: true - }) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/item/test/dividers/app.module.ts b/src/components/input/test/inset-inputs/app/app.module.ts similarity index 58% rename from src/components/item/test/dividers/app.module.ts rename to src/components/input/test/inset-inputs/app/app.module.ts index e04b1caf5a..608fd42f33 100644 --- a/src/components/item/test/dividers/app.module.ts +++ b/src/components/input/test/inset-inputs/app/app.module.ts @@ -1,31 +1,29 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} +import { RootPage } from '../pages/root-page/root-page'; @Component({ template: '' }) export class E2EApp { - rootPage = E2EPage; + rootPage = RootPage; } @NgModule({ declarations: [ E2EApp, - E2EPage + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ E2EApp, - E2EPage + RootPage ] }) export class AppModule {} diff --git a/src/components/input/test/inset-inputs/app/main.ts b/src/components/input/test/inset-inputs/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/inset-inputs/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/inset-inputs/main.html b/src/components/input/test/inset-inputs/pages/root-page/root-page.html similarity index 99% rename from src/components/input/test/inset-inputs/main.html rename to src/components/input/test/inset-inputs/pages/root-page/root-page.html index 8855029980..dd80a590b9 100644 --- a/src/components/input/test/inset-inputs/main.html +++ b/src/components/input/test/inset-inputs/pages/root-page/root-page.html @@ -69,4 +69,4 @@ - + \ No newline at end of file diff --git a/src/components/input/test/inset-inputs/pages/root-page/root-page.ts b/src/components/input/test/inset-inputs/pages/root-page/root-page.ts new file mode 100644 index 0000000000..96922d3e2d --- /dev/null +++ b/src/components/input/test/inset-inputs/pages/root-page/root-page.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/input/test/placeholder-labels/app.module.ts b/src/components/input/test/placeholder-labels/app.module.ts deleted file mode 100644 index d71047c8ce..0000000000 --- a/src/components/input/test/placeholder-labels/app.module.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - isReadonly: boolean = true; - - toggleReadonly() { - this.isReadonly = !this.isReadonly; - } - -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/item/test/icons/app.module.ts b/src/components/input/test/placeholder-labels/app/app.module.ts similarity index 58% rename from src/components/item/test/icons/app.module.ts rename to src/components/input/test/placeholder-labels/app/app.module.ts index e04b1caf5a..608fd42f33 100644 --- a/src/components/item/test/icons/app.module.ts +++ b/src/components/input/test/placeholder-labels/app/app.module.ts @@ -1,31 +1,29 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} +import { RootPage } from '../pages/root-page/root-page'; @Component({ template: '' }) export class E2EApp { - rootPage = E2EPage; + rootPage = RootPage; } @NgModule({ declarations: [ E2EApp, - E2EPage + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ E2EApp, - E2EPage + RootPage ] }) export class AppModule {} diff --git a/src/components/input/test/placeholder-labels/app/main.ts b/src/components/input/test/placeholder-labels/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/placeholder-labels/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/placeholder-labels/main.html b/src/components/input/test/placeholder-labels/pages/root-page/root-page.html similarity index 99% rename from src/components/input/test/placeholder-labels/main.html rename to src/components/input/test/placeholder-labels/pages/root-page/root-page.html index 6e22d6eeb2..b4f12e578b 100644 --- a/src/components/input/test/placeholder-labels/main.html +++ b/src/components/input/test/placeholder-labels/pages/root-page/root-page.html @@ -72,4 +72,4 @@ - + \ No newline at end of file diff --git a/src/components/input/test/placeholder-labels/pages/root-page/root-page.ts b/src/components/input/test/placeholder-labels/pages/root-page/root-page.ts new file mode 100644 index 0000000000..f7527bd807 --- /dev/null +++ b/src/components/input/test/placeholder-labels/pages/root-page/root-page.ts @@ -0,0 +1,13 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + isReadonly: boolean = true; + + toggleReadonly() { + this.isReadonly = !this.isReadonly; + } + +} diff --git a/src/components/input/test/stacked-labels/app/app.module.ts b/src/components/input/test/stacked-labels/app/app.module.ts new file mode 100644 index 0000000000..2bca994a45 --- /dev/null +++ b/src/components/input/test/stacked-labels/app/app.module.ts @@ -0,0 +1,29 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + root = RootPage; +} + +@NgModule({ + declarations: [ + E2EApp, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/input/test/stacked-labels/app/main.ts b/src/components/input/test/stacked-labels/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/input/test/stacked-labels/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/input/test/stacked-labels/main.html b/src/components/input/test/stacked-labels/pages/root-page/root-page.html similarity index 99% rename from src/components/input/test/stacked-labels/main.html rename to src/components/input/test/stacked-labels/pages/root-page/root-page.html index 100ac391f7..eb718bb58c 100644 --- a/src/components/input/test/stacked-labels/main.html +++ b/src/components/input/test/stacked-labels/pages/root-page/root-page.html @@ -74,4 +74,4 @@ - + \ No newline at end of file diff --git a/src/components/input/test/stacked-labels/pages/root-page/root-page.ts b/src/components/input/test/stacked-labels/pages/root-page/root-page.ts new file mode 100644 index 0000000000..e4920f4c56 --- /dev/null +++ b/src/components/input/test/stacked-labels/pages/root-page/root-page.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + gender = ''; +} diff --git a/src/components/item/test/buttons/app.module.ts b/src/components/item/test/buttons/app.module.ts deleted file mode 100644 index 88024e2bdd..0000000000 --- a/src/components/item/test/buttons/app.module.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - testClick(ev: any) { - console.log('CLICK!', ev.target.tagName, ev.target.textContent.trim()); - } - - testClickOutsize(ev: any) { - console.log('CLICK OUTSIDE!', ev.target.tagName, ev.target.textContent.trim()); - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/item/test/buttons/app/app.module.ts b/src/components/item/test/buttons/app/app.module.ts new file mode 100644 index 0000000000..608fd42f33 --- /dev/null +++ b/src/components/item/test/buttons/app/app.module.ts @@ -0,0 +1,29 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + rootPage = RootPage; +} + +@NgModule({ + declarations: [ + E2EApp, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/item/test/buttons/app/main.ts b/src/components/item/test/buttons/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/buttons/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/buttons/main.html b/src/components/item/test/buttons/pages/root-page/root-page.html similarity index 99% rename from src/components/item/test/buttons/main.html rename to src/components/item/test/buttons/pages/root-page/root-page.html index 76054d5db0..da04b529aa 100644 --- a/src/components/item/test/buttons/main.html +++ b/src/components/item/test/buttons/pages/root-page/root-page.html @@ -129,4 +129,4 @@ img { height: 100px; } - + \ No newline at end of file diff --git a/src/components/item/test/buttons/pages/root-page/root-page.ts b/src/components/item/test/buttons/pages/root-page/root-page.ts new file mode 100644 index 0000000000..1c2b3612b1 --- /dev/null +++ b/src/components/item/test/buttons/pages/root-page/root-page.ts @@ -0,0 +1,14 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + testClick(ev: any) { + console.log('CLICK!', ev.target.tagName, ev.target.textContent.trim()); + } + + testClickOutsize(ev: any) { + console.log('CLICK OUTSIDE!', ev.target.tagName, ev.target.textContent.trim()); + } +} diff --git a/src/components/item/test/colors/app/app.module.ts b/src/components/item/test/colors/app/app.module.ts new file mode 100644 index 0000000000..608fd42f33 --- /dev/null +++ b/src/components/item/test/colors/app/app.module.ts @@ -0,0 +1,29 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + rootPage = RootPage; +} + +@NgModule({ + declarations: [ + E2EApp, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/item/test/colors/app/main.ts b/src/components/item/test/colors/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/colors/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/colors/main.html b/src/components/item/test/colors/pages/root-page/root-page.html similarity index 100% rename from src/components/item/test/colors/main.html rename to src/components/item/test/colors/pages/root-page/root-page.html diff --git a/src/components/item/test/colors/pages/root-page/root-page.ts b/src/components/item/test/colors/pages/root-page/root-page.ts new file mode 100644 index 0000000000..067caddbcc --- /dev/null +++ b/src/components/item/test/colors/pages/root-page/root-page.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + +} diff --git a/src/components/item/test/dividers/app/app.module.ts b/src/components/item/test/dividers/app/app.module.ts new file mode 100644 index 0000000000..608fd42f33 --- /dev/null +++ b/src/components/item/test/dividers/app/app.module.ts @@ -0,0 +1,29 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + rootPage = RootPage; +} + +@NgModule({ + declarations: [ + E2EApp, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/item/test/dividers/app/main.ts b/src/components/item/test/dividers/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/dividers/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/dividers/main.html b/src/components/item/test/dividers/pages/root-page/root-page.html similarity index 99% rename from src/components/item/test/dividers/main.html rename to src/components/item/test/dividers/pages/root-page/root-page.html index a8bd21e9ac..947547d802 100644 --- a/src/components/item/test/dividers/main.html +++ b/src/components/item/test/dividers/pages/root-page/root-page.html @@ -105,4 +105,4 @@ img { height: 100px; } - + \ No newline at end of file diff --git a/src/components/item/test/dividers/pages/root-page/root-page.ts b/src/components/item/test/dividers/pages/root-page/root-page.ts new file mode 100644 index 0000000000..96922d3e2d --- /dev/null +++ b/src/components/item/test/dividers/pages/root-page/root-page.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/item/test/groups/app/app.module.ts b/src/components/item/test/groups/app/app.module.ts new file mode 100644 index 0000000000..a0022f5c1c --- /dev/null +++ b/src/components/item/test/groups/app/app.module.ts @@ -0,0 +1,35 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { SessionList } from '../pages/session-list/session-list'; + + +@Component({ + template: '' +}) +export class E2EApp { + root = SessionList; +} + +@NgModule({ + declarations: [ + E2EApp, + SessionList + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp, {}, { + links: [ + { loadChildren: '../pages/session-detail/session-detail.module#SessionDetailModule', name: 'SessionDetail'} + ] + }) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + SessionList + ] +}) +export class AppModule {} + diff --git a/src/components/item/test/groups/app/main.ts b/src/components/item/test/groups/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/groups/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/groups/pages/session-detail/session-detail.html b/src/components/item/test/groups/pages/session-detail/session-detail.html new file mode 100644 index 0000000000..1f9b2133ba --- /dev/null +++ b/src/components/item/test/groups/pages/session-detail/session-detail.html @@ -0,0 +1,9 @@ + + + {{session.name}} + + + +

{{session.description}}

+

+ \ No newline at end of file diff --git a/src/components/item/test/groups/pages/session-detail/session-detail.module.ts b/src/components/item/test/groups/pages/session-detail/session-detail.module.ts new file mode 100644 index 0000000000..900166726d --- /dev/null +++ b/src/components/item/test/groups/pages/session-detail/session-detail.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { SessionDetail } from './session-detail'; +import { DeepLinkModule } from '../../../../../..'; + +@NgModule({ + declarations: [ + SessionDetail + ], + imports: [ + DeepLinkModule.forChild(SessionDetail) + ], + entryComponents: [ + SessionDetail + ], + providers: [] +}) +export class SessionDetailModule {} diff --git a/src/components/item/test/groups/pages/session-detail/session-detail.ts b/src/components/item/test/groups/pages/session-detail/session-detail.ts new file mode 100644 index 0000000000..736f2f1b10 --- /dev/null +++ b/src/components/item/test/groups/pages/session-detail/session-detail.ts @@ -0,0 +1,13 @@ +import { Component } from '@angular/core'; +import { NavController, NavParams } from '../../../../../..'; + +@Component({ + templateUrl: 'session-detail.html' +}) +export class SessionDetail { + session: any; + + constructor(params: NavParams, public navCtrl: NavController) { + this.session = params.data; + } +} diff --git a/src/components/item/test/groups/session-list.html b/src/components/item/test/groups/pages/session-list/session-list.html similarity index 98% rename from src/components/item/test/groups/session-list.html rename to src/components/item/test/groups/pages/session-list/session-list.html index b5493797c7..ac770fb1ea 100644 --- a/src/components/item/test/groups/session-list.html +++ b/src/components/item/test/groups/pages/session-list/session-list.html @@ -38,4 +38,4 @@ - + \ No newline at end of file diff --git a/src/components/item/test/groups/app.module.ts b/src/components/item/test/groups/pages/session-list/session-list.ts similarity index 96% rename from src/components/item/test/groups/app.module.ts rename to src/components/item/test/groups/pages/session-list/session-list.ts index 5baf25ab64..14e964a5da 100644 --- a/src/components/item/test/groups/app.module.ts +++ b/src/components/item/test/groups/pages/session-list/session-list.ts @@ -1,28 +1,5 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, NavController, NavParams } from '../../../../../ionic-angular'; - - -@Component({ - template: ` - - - {{session.name}} - - - -

{{session.description}}

-

- - ` -}) -export class SessionDetail { - session: any; - - constructor(params: NavParams, public navCtrl: NavController) { - this.session = params.data; - } -} - +import { Component } from '@angular/core'; +import { NavController } from '../../../../../..'; @Component({ templateUrl: 'session-list.html' @@ -37,43 +14,17 @@ export class SessionList { } openSession(session: any) { - this.navCtrl.push(SessionDetail, session); + this.navCtrl.push('SessionDetail', session); } reload() { window.location.reload(); } -} +}; -@Component({ - template: '' -}) -export class E2EApp { - root = SessionList; -} - -@NgModule({ - declarations: [ - E2EApp, - SessionList, - SessionDetail - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - SessionList, - SessionDetail - ] -}) -export class AppModule {} - - -let data = [ +const data = [ { 'time': '9:00 AM', 'talks': [ diff --git a/src/components/item/test/icons/app/app.module.ts b/src/components/item/test/icons/app/app.module.ts new file mode 100644 index 0000000000..608fd42f33 --- /dev/null +++ b/src/components/item/test/icons/app/app.module.ts @@ -0,0 +1,29 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + rootPage = RootPage; +} + +@NgModule({ + declarations: [ + E2EApp, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/item/test/icons/app/main.ts b/src/components/item/test/icons/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/icons/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/icons/main.html b/src/components/item/test/icons/pages/root-page/root-page.html similarity index 99% rename from src/components/item/test/icons/main.html rename to src/components/item/test/icons/pages/root-page/root-page.html index 3d1d5a5459..8196d29402 100644 --- a/src/components/item/test/icons/main.html +++ b/src/components/item/test/icons/pages/root-page/root-page.html @@ -74,4 +74,4 @@ 99 - + \ No newline at end of file diff --git a/src/components/item/test/icons/pages/root-page/root-page.ts b/src/components/item/test/icons/pages/root-page/root-page.ts new file mode 100644 index 0000000000..96922d3e2d --- /dev/null +++ b/src/components/item/test/icons/pages/root-page/root-page.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/item/test/images/app.module.ts b/src/components/item/test/images/app.module.ts deleted file mode 100644 index e04b1caf5a..0000000000 --- a/src/components/item/test/images/app.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/item/test/images/app/app.module.ts b/src/components/item/test/images/app/app.module.ts new file mode 100644 index 0000000000..608fd42f33 --- /dev/null +++ b/src/components/item/test/images/app/app.module.ts @@ -0,0 +1,29 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + rootPage = RootPage; +} + +@NgModule({ + declarations: [ + E2EApp, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/item/test/images/app/main.ts b/src/components/item/test/images/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/images/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/images/main.html b/src/components/item/test/images/pages/root-page/root-page.html similarity index 99% rename from src/components/item/test/images/main.html rename to src/components/item/test/images/pages/root-page/root-page.html index 661d9a5deb..9f6605fb96 100644 --- a/src/components/item/test/images/main.html +++ b/src/components/item/test/images/pages/root-page/root-page.html @@ -72,4 +72,4 @@ img { height: 100px; } - + \ No newline at end of file diff --git a/src/components/item/test/images/pages/root-page/root-page.ts b/src/components/item/test/images/pages/root-page/root-page.ts new file mode 100644 index 0000000000..96922d3e2d --- /dev/null +++ b/src/components/item/test/images/pages/root-page/root-page.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/item/test/inputs/app.module.ts b/src/components/item/test/inputs/app.module.ts deleted file mode 100644 index caf458edec..0000000000 --- a/src/components/item/test/inputs/app.module.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - disabled = false; - datetime = '2016-12-09'; - toggle = true; - select = 'n64'; - text = 'Text'; - checkbox = true; - range = 10; - - boolDisabled(): boolean { - return this.disabled; - } - - strDisabled(): string { - return this.disabled + ''; - } -} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/input/test/inset-inputs/app.module.ts b/src/components/item/test/inputs/app/app.module.ts similarity index 58% rename from src/components/input/test/inset-inputs/app.module.ts rename to src/components/item/test/inputs/app/app.module.ts index e04b1caf5a..186823e2ee 100644 --- a/src/components/input/test/inset-inputs/app.module.ts +++ b/src/components/item/test/inputs/app/app.module.ts @@ -1,31 +1,30 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; +import { RootPage } from '../pages/root-page/root-page'; -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} @Component({ template: '' }) export class E2EApp { - rootPage = E2EPage; + rootPage = RootPage; } @NgModule({ declarations: [ E2EApp, - E2EPage + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ E2EApp, - E2EPage + RootPage ] }) export class AppModule {} diff --git a/src/components/item/test/inputs/app/main.ts b/src/components/item/test/inputs/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/inputs/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/inputs/e2e.ts b/src/components/item/test/inputs/e2e.ts index 7937d6553a..29349887a9 100644 --- a/src/components/item/test/inputs/e2e.ts +++ b/src/components/item/test/inputs/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should disable all inputs', function() { element(by.css('.e2eDisableButton')).click(); diff --git a/src/components/item/test/inputs/main.html b/src/components/item/test/inputs/pages/root-page/root-page.html similarity index 99% rename from src/components/item/test/inputs/main.html rename to src/components/item/test/inputs/pages/root-page/root-page.html index 9d95e995d4..98b30f50de 100644 --- a/src/components/item/test/inputs/main.html +++ b/src/components/item/test/inputs/pages/root-page/root-page.html @@ -67,4 +67,4 @@ - + \ No newline at end of file diff --git a/src/components/item/test/inputs/pages/root-page/root-page.ts b/src/components/item/test/inputs/pages/root-page/root-page.ts new file mode 100644 index 0000000000..049bfeb791 --- /dev/null +++ b/src/components/item/test/inputs/pages/root-page/root-page.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + disabled = false; + datetime = '2016-12-09'; + toggle = true; + select = 'n64'; + text = 'Text'; + checkbox = true; + range = 10; + + boolDisabled(): boolean { + return this.disabled; + } + + strDisabled(): string { + return this.disabled + ''; + } +} diff --git a/src/components/item/test/media/app.module.ts b/src/components/item/test/media/app.module.ts deleted file mode 100644 index e04b1caf5a..0000000000 --- a/src/components/item/test/media/app.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/item/test/colors/app.module.ts b/src/components/item/test/media/app/app.module.ts similarity index 58% rename from src/components/item/test/colors/app.module.ts rename to src/components/item/test/media/app/app.module.ts index f586d01edb..186823e2ee 100644 --- a/src/components/item/test/colors/app.module.ts +++ b/src/components/item/test/media/app/app.module.ts @@ -1,33 +1,30 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; +import { RootPage } from '../pages/root-page/root-page'; -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - -} @Component({ template: '' }) export class E2EApp { - rootPage = E2EPage; + rootPage = RootPage; } @NgModule({ declarations: [ E2EApp, - E2EPage + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ E2EApp, - E2EPage + RootPage ] }) export class AppModule {} diff --git a/src/components/item/test/media/app/main.ts b/src/components/item/test/media/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/media/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/media/main.html b/src/components/item/test/media/pages/root-page/root-page.html similarity index 99% rename from src/components/item/test/media/main.html rename to src/components/item/test/media/pages/root-page/root-page.html index d4a0d85caf..bd394953f8 100644 --- a/src/components/item/test/media/main.html +++ b/src/components/item/test/media/pages/root-page/root-page.html @@ -73,4 +73,4 @@ img { height: 100px; } - + \ No newline at end of file diff --git a/src/components/item/test/media/pages/root-page/root-page.ts b/src/components/item/test/media/pages/root-page/root-page.ts new file mode 100644 index 0000000000..96922d3e2d --- /dev/null +++ b/src/components/item/test/media/pages/root-page/root-page.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/item/test/reorder/app.module.ts b/src/components/item/test/reorder/app.module.ts deleted file mode 100644 index e0b49f1caa..0000000000 --- a/src/components/item/test/reorder/app.module.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { Component, ChangeDetectorRef, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, reorderArray } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - items: any[] = []; - isReordering: boolean = false; - - constructor(private d: ChangeDetectorRef) { - let nu = 9; - for (let i = 0; i < nu; i++) { - this.items.push(i); - } - } - - clickedButton(num: number) { - console.log('clicked', num); - } - - toggle() { - this.isReordering = !this.isReordering; - } - - reorder(indexes: any) { - this.items = reorderArray(this.items, indexes); - } -} - - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/item/test/reorder/app/app.module.ts b/src/components/item/test/reorder/app/app.module.ts new file mode 100644 index 0000000000..2bca994a45 --- /dev/null +++ b/src/components/item/test/reorder/app/app.module.ts @@ -0,0 +1,29 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + root = RootPage; +} + +@NgModule({ + declarations: [ + E2EApp, + RootPage + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + RootPage + ] +}) +export class AppModule {} diff --git a/src/components/item/test/reorder/app/main.ts b/src/components/item/test/reorder/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/reorder/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/reorder/main.html b/src/components/item/test/reorder/pages/root-page/root-page.html similarity index 100% rename from src/components/item/test/reorder/main.html rename to src/components/item/test/reorder/pages/root-page/root-page.html diff --git a/src/components/item/test/reorder/pages/root-page/root-page.ts b/src/components/item/test/reorder/pages/root-page/root-page.ts new file mode 100644 index 0000000000..5e1139c6fc --- /dev/null +++ b/src/components/item/test/reorder/pages/root-page/root-page.ts @@ -0,0 +1,29 @@ +import { Component, ChangeDetectorRef } from '@angular/core'; +import { reorderArray } from '../../../../../..'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage { + items: any[] = []; + isReordering: boolean = false; + + constructor(private d: ChangeDetectorRef) { + let nu = 9; + for (let i = 0; i < nu; i++) { + this.items.push(i); + } + } + + clickedButton(num: number) { + console.log('clicked', num); + } + + toggle() { + this.isReordering = !this.isReordering; + } + + reorder(indexes: any) { + this.items = reorderArray(this.items, indexes); + } +} diff --git a/src/components/list/test/header-scenarios/app.module.ts b/src/components/item/test/sliding/app/app.module.ts similarity index 58% rename from src/components/list/test/header-scenarios/app.module.ts rename to src/components/item/test/sliding/app/app.module.ts index 5d621a484b..d24bc23c0f 100644 --- a/src/components/list/test/header-scenarios/app.module.ts +++ b/src/components/item/test/sliding/app/app.module.ts @@ -1,36 +1,30 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage { - testClick(ev: UIEvent) { - console.log(ev); - } -} +import { RootPage } from '../pages/root-page/root-page'; @Component({ template: '' }) export class E2EApp { - root = E2EPage; + root = RootPage; } @NgModule({ declarations: [ E2EApp, - E2EPage + RootPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], entryComponents: [ E2EApp, - E2EPage + RootPage ] }) export class AppModule {} diff --git a/src/components/item/test/sliding/app/main.ts b/src/components/item/test/sliding/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/sliding/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/sliding/main.html b/src/components/item/test/sliding/pages/root-page/root-page.html similarity index 99% rename from src/components/item/test/sliding/main.html rename to src/components/item/test/sliding/pages/root-page/root-page.html index fe7af3ce8c..47e4fa3929 100644 --- a/src/components/item/test/sliding/main.html +++ b/src/components/item/test/sliding/pages/root-page/root-page.html @@ -285,4 +285,4 @@ display: none; } - + \ No newline at end of file diff --git a/src/components/item/test/sliding/app.module.ts b/src/components/item/test/sliding/pages/root-page/root-page.ts similarity index 79% rename from src/components/item/test/sliding/app.module.ts rename to src/components/item/test/sliding/pages/root-page/root-page.ts index ca5639d08f..3fe02cf272 100644 --- a/src/components/item/test/sliding/app.module.ts +++ b/src/components/item/test/sliding/pages/root-page/root-page.ts @@ -1,11 +1,10 @@ -import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, AlertController, NavController, List, ItemSliding, ToastController } from '../../../../../ionic-angular'; - +import { Component, ViewChild } from '@angular/core'; +import { AlertController, NavController, List, ItemSliding, ToastController } from '../../../../../../'; @Component({ - templateUrl: 'main.html' + templateUrl: 'root-page.html' }) -export class E2EPage { +export class RootPage { @ViewChild('myList', {read: List}) list: List; items: number[] = []; @@ -113,27 +112,3 @@ export class E2EPage { window.location.reload(); } } - - -@Component({ - template: '' -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/item/test/text/app.module.ts b/src/components/item/test/text/app.module.ts deleted file mode 100644 index e04b1caf5a..0000000000 --- a/src/components/item/test/text/app.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class E2EPage {} - -@Component({ - template: '' -}) -export class E2EApp { - rootPage = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/item/test/text/app/app.component.ts b/src/components/item/test/text/app/app.component.ts new file mode 100644 index 0000000000..5942ba7d45 --- /dev/null +++ b/src/components/item/test/text/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { RootPage } from '../pages/root-page/root-page'; + +@Component({ + template: '' +}) +export class E2EApp { + rootPage = RootPage; +} diff --git a/src/components/item/test/text/app/app.module.ts b/src/components/item/test/text/app/app.module.ts new file mode 100644 index 0000000000..c8aaeb4bd4 --- /dev/null +++ b/src/components/item/test/text/app/app.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { E2EApp } from './app.component'; +import { RootPageModule } from '../pages/root-page/root-page.module'; + +@NgModule({ + declarations: [ + E2EApp + ], + imports: [ + BrowserModule, + RootPageModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp + ] +}) +export class AppModule {} diff --git a/src/components/item/test/text/app/main.ts b/src/components/item/test/text/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/item/test/text/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/item/test/text/main.html b/src/components/item/test/text/pages/root-page/root-page.html similarity index 100% rename from src/components/item/test/text/main.html rename to src/components/item/test/text/pages/root-page/root-page.html diff --git a/src/components/item/test/text/pages/root-page/root-page.module.ts b/src/components/item/test/text/pages/root-page/root-page.module.ts new file mode 100644 index 0000000000..c5120a9437 --- /dev/null +++ b/src/components/item/test/text/pages/root-page/root-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { RootPage } from './root-page'; + +@NgModule({ + declarations: [ + RootPage, + ], + imports: [ + DeepLinkModule.forChild(RootPage) + ], + entryComponents: [ + RootPage, + ] +}) +export class RootPageModule {} diff --git a/src/components/item/test/text/pages/root-page/root-page.ts b/src/components/item/test/text/pages/root-page/root-page.ts new file mode 100644 index 0000000000..96922d3e2d --- /dev/null +++ b/src/components/item/test/text/pages/root-page/root-page.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'root-page.html' +}) +export class RootPage {} diff --git a/src/components/list/test/chat-list/app.module.ts b/src/components/list/test/chat-list/app.module.ts index 5d621a484b..403854bb54 100644 --- a/src/components/list/test/chat-list/app.module.ts +++ b/src/components/list/test/chat-list/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -25,6 +26,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/list/test/chat-list/main.ts b/src/components/list/test/chat-list/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/list/test/chat-list/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/list/test/header-scenarios/app/app.component.ts b/src/components/list/test/header-scenarios/app/app.component.ts new file mode 100644 index 0000000000..011f554da2 --- /dev/null +++ b/src/components/list/test/header-scenarios/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +import { E2EPage } from '../pages/main/main' + +@Component({ + template: '' +}) +export class E2EApp { + root = E2EPage; +} diff --git a/src/components/list/test/header-scenarios/app/app.module.ts b/src/components/list/test/header-scenarios/app/app.module.ts new file mode 100644 index 0000000000..c597328319 --- /dev/null +++ b/src/components/list/test/header-scenarios/app/app.module.ts @@ -0,0 +1,22 @@ +import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { E2EApp } from './app.component'; +import { E2EPageModule } from '../pages/main/main.module'; + +@NgModule({ + declarations: [ + E2EApp + ], + imports: [ + BrowserModule, + E2EPageModule, + IonicModule.forRoot(E2EApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp + ] +}) +export class AppModule {} diff --git a/src/components/list/test/header-scenarios/app/main.ts b/src/components/list/test/header-scenarios/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/list/test/header-scenarios/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/list/test/header-scenarios/main.html b/src/components/list/test/header-scenarios/pages/main/main.html similarity index 100% rename from src/components/list/test/header-scenarios/main.html rename to src/components/list/test/header-scenarios/pages/main/main.html diff --git a/src/components/list/test/header-scenarios/pages/main/main.module.ts b/src/components/list/test/header-scenarios/pages/main/main.module.ts new file mode 100644 index 0000000000..1cc785fd59 --- /dev/null +++ b/src/components/list/test/header-scenarios/pages/main/main.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { E2EPage } from './main'; + +@NgModule({ + declarations: [ + E2EPage, + ], + imports: [ + DeepLinkModule.forChild(E2EPage) + ], + entryComponents: [ + E2EPage, + ] +}) +export class E2EPageModule {} diff --git a/src/components/list/test/header-scenarios/pages/main/main.ts b/src/components/list/test/header-scenarios/pages/main/main.ts new file mode 100644 index 0000000000..5ec9c8a5c2 --- /dev/null +++ b/src/components/list/test/header-scenarios/pages/main/main.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: 'main.html' +}) +export class E2EPage { + testClick(ev: UIEvent) { + console.log(ev); + } +} diff --git a/src/components/list/test/headers/app.module.ts b/src/components/list/test/headers/app.module.ts index e04b1caf5a..56f5e35494 100644 --- a/src/components/list/test/headers/app.module.ts +++ b/src/components/list/test/headers/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -20,6 +21,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/list/test/headers/main.ts b/src/components/list/test/headers/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/list/test/headers/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/list/test/inset/app.module.ts b/src/components/list/test/inset/app.module.ts index e04b1caf5a..56f5e35494 100644 --- a/src/components/list/test/inset/app.module.ts +++ b/src/components/list/test/inset/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -20,6 +21,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/list/test/inset/main.ts b/src/components/list/test/inset/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/list/test/inset/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/list/test/no-lines/app.module.ts b/src/components/list/test/no-lines/app.module.ts index e04b1caf5a..56f5e35494 100644 --- a/src/components/list/test/no-lines/app.module.ts +++ b/src/components/list/test/no-lines/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -20,6 +21,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/list/test/no-lines/main.ts b/src/components/list/test/no-lines/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/list/test/no-lines/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/list/test/repeat-headers/app.module.ts b/src/components/list/test/repeat-headers/app.module.ts index 117fd06101..c917efe6b7 100644 --- a/src/components/list/test/repeat-headers/app.module.ts +++ b/src/components/list/test/repeat-headers/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -26,6 +27,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/list/test/repeat-headers/main.ts b/src/components/list/test/repeat-headers/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/list/test/repeat-headers/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/list/test/sticky/app.module.ts b/src/components/list/test/sticky/app.module.ts index ca320e0408..1ca37e2621 100644 --- a/src/components/list/test/sticky/app.module.ts +++ b/src/components/list/test/sticky/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -41,6 +42,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/list/test/sticky/main.ts b/src/components/list/test/sticky/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/list/test/sticky/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/loading/test/basic/app.module.ts b/src/components/loading/test/basic/app.module.ts index f4e714156a..7b54d69809 100644 --- a/src/components/loading/test/basic/app.module.ts +++ b/src/components/loading/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewEncapsulation, NgModule } from '@angular/core'; -import { App, IonicApp, IonicModule, LoadingController, NavController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { App, IonicApp, IonicModule, LoadingController, NavController } from '../../../..'; @Component({ @@ -306,11 +307,11 @@ export class E2EApp { root = E2EPage; constructor(app: App) { - app.viewDidLeave.subscribe(ev => { + app.viewDidLeave.subscribe((ev: any) => { console.log('App didLeave'); }); - app.viewWillLeave.subscribe(ev => { + app.viewWillLeave.subscribe((ev: any) => { console.log('App willLeave'); }); } @@ -324,6 +325,7 @@ export class E2EApp { Page3 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/loading/test/basic/e2e.ts b/src/components/loading/test/basic/e2e.ts index 338516c2fb..8197598ecf 100644 --- a/src/components/loading/test/basic/e2e.ts +++ b/src/components/loading/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open default spinner', function() { element(by.css('.e2eLoadingDefaultSpinner')).click(); diff --git a/src/components/loading/test/basic/main.ts b/src/components/loading/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/loading/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/loading/test/tabs/app.module.ts b/src/components/loading/test/tabs/app.module.ts index ba2d7711c2..456e73bb09 100644 --- a/src/components/loading/test/tabs/app.module.ts +++ b/src/components/loading/test/tabs/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, LoadingController, NavController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, LoadingController, NavController } from '../../../..'; @Component({ @@ -78,6 +79,7 @@ export class E2EApp { Page2 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/loading/test/tabs/e2e.ts b/src/components/loading/test/tabs/e2e.ts index 2ebc67cc6a..22946a3cdf 100644 --- a/src/components/loading/test/tabs/e2e.ts +++ b/src/components/loading/test/tabs/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should show default spinner', function() { element(by.css('.e2eLoadingTabsContent')).click(); diff --git a/src/components/loading/test/tabs/main.ts b/src/components/loading/test/tabs/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/loading/test/tabs/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/menu/test/basic/app.module.ts b/src/components/menu/test/basic/app.module.ts index 9dd0758ac4..1f21535dff 100644 --- a/src/components/menu/test/basic/app.module.ts +++ b/src/components/menu/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { AlertController, IonicApp, IonicModule, MenuController, ModalController, NavController, Nav, ViewController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { AlertController, IonicApp, IonicModule, MenuController, ModalController, NavController, Nav, ViewController } from '../../../..'; @Component({ @@ -128,6 +129,7 @@ export class E2EApp { Modal ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/menu/test/basic/e2e.ts b/src/components/menu/test/basic/e2e.ts index 72be8ad3a8..827fa1cb65 100644 --- a/src/components/menu/test/basic/e2e.ts +++ b/src/components/menu/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should toggle left menu', function() { element(by.css('.e2eContentToggleLeftMenu')).click(); diff --git a/src/components/menu/test/basic/main.ts b/src/components/menu/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/menu/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/menu/test/disable-swipe/app.module.ts b/src/components/menu/test/disable-swipe/app.module.ts index 02c016dbe7..3400c5c681 100644 --- a/src/components/menu/test/disable-swipe/app.module.ts +++ b/src/components/menu/test/disable-swipe/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, MenuController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, MenuController } from '../../../..'; @Component({ @@ -38,6 +39,7 @@ export class E2EApp { Page1 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/menu/test/disable-swipe/main.ts b/src/components/menu/test/disable-swipe/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/menu/test/disable-swipe/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/menu/test/enable-disable/app.module.ts b/src/components/menu/test/enable-disable/app.module.ts index 116141b939..05b582d2c7 100644 --- a/src/components/menu/test/enable-disable/app.module.ts +++ b/src/components/menu/test/enable-disable/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, App, MenuController, Nav } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, App, MenuController, Nav } from '../../../..'; @Component({ @@ -59,6 +60,7 @@ export class E2EApp { Page2 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/menu/test/enable-disable/main.ts b/src/components/menu/test/enable-disable/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/menu/test/enable-disable/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/menu/test/multiple/app.module.ts b/src/components/menu/test/multiple/app.module.ts index 1a8e3874e4..09d4590a57 100644 --- a/src/components/menu/test/multiple/app.module.ts +++ b/src/components/menu/test/multiple/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, MenuController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, MenuController } from '../../../..'; @Component({ @@ -37,6 +38,7 @@ export class E2EApp { Page1 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/menu/test/multiple/main.ts b/src/components/menu/test/multiple/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/menu/test/multiple/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/menu/test/overlay/app.module.ts b/src/components/menu/test/overlay/app.module.ts index 8a302d352b..34ed855833 100644 --- a/src/components/menu/test/overlay/app.module.ts +++ b/src/components/menu/test/overlay/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Nav, AlertController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Nav, AlertController } from '../../../..'; @Component({templateUrl: 'page1.html'}) @@ -40,6 +41,7 @@ export class E2EApp { Page1 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/menu/test/overlay/main.ts b/src/components/menu/test/overlay/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/menu/test/overlay/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/menu/test/push/app.module.ts b/src/components/menu/test/push/app.module.ts index 8a302d352b..34ed855833 100644 --- a/src/components/menu/test/push/app.module.ts +++ b/src/components/menu/test/push/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Nav, AlertController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Nav, AlertController } from '../../../..'; @Component({templateUrl: 'page1.html'}) @@ -40,6 +41,7 @@ export class E2EApp { Page1 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/menu/test/push/main.ts b/src/components/menu/test/push/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/menu/test/push/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/menu/test/reveal/app.module.ts b/src/components/menu/test/reveal/app.module.ts index d6099c514e..70b4c875cd 100644 --- a/src/components/menu/test/reveal/app.module.ts +++ b/src/components/menu/test/reveal/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Nav } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Nav } from '../../../..'; @Component({templateUrl: 'page1.html'}) @@ -30,6 +31,7 @@ export class E2EApp { Page1 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/menu/test/reveal/main.ts b/src/components/menu/test/reveal/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/menu/test/reveal/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/modal/test/basic/app.module.ts b/src/components/modal/test/basic/app.module.ts index 16c5a279e4..8dc3a6fe7f 100644 --- a/src/components/modal/test/basic/app.module.ts +++ b/src/components/modal/test/basic/app.module.ts @@ -1,8 +1,9 @@ import { Component, Injectable, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { ActionSheetController, AlertController, App, Config, IonicApp, IonicModule, ModalController, NavController, - NavParams, Platform, ToastController, ViewController } from '../../../../../ionic-angular'; + NavParams, Platform, ToastController, ViewController } from '../../../..'; @Injectable() @@ -657,6 +658,7 @@ export class E2EApp { ToolbarModal ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp, { statusbarPadding: true, swipeBackEnabled: true diff --git a/src/components/modal/test/basic/e2e.ts b/src/components/modal/test/basic/e2e.ts index 0500dc4c10..90b2728f9b 100644 --- a/src/components/modal/test/basic/e2e.ts +++ b/src/components/modal/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open modal', function() { element(by.css('.e2eOpenModal')).click(); diff --git a/src/components/modal/test/basic/main.ts b/src/components/modal/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/modal/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/modal/test/modal.spec.ts b/src/components/modal/test/modal.spec.ts index 921f1a6f51..583b01d4b5 100644 --- a/src/components/modal/test/modal.spec.ts +++ b/src/components/modal/test/modal.spec.ts @@ -1,5 +1,6 @@ +import { mockApp, mockConfig } from '../../../util/mock-providers'; import { Component } from '@angular/core'; -import { ModalController } from '../modal'; +import { ModalController } from '../modal-controller'; import { ModalCmp } from '../modal-component'; import { ViewController } from '../../../navigation/view-controller'; @@ -8,7 +9,7 @@ describe('Modal', () => { describe('create', () => { it('should have the correct properties on modal view controller instance', () => { - let modalCtrl = new ModalController(null); + let modalCtrl = new ModalController(mockApp(), mockConfig()); let modalViewController = modalCtrl.create(ComponentToPresent); expect(modalViewController.component).toEqual(ModalCmp); expect(modalViewController.isOverlay).toEqual(true); diff --git a/src/components/nav/test/basic/app.module.ts b/src/components/nav/test/basic/app.module.ts deleted file mode 100644 index 6be4286c51..0000000000 --- a/src/components/nav/test/basic/app.module.ts +++ /dev/null @@ -1,857 +0,0 @@ -import { NgModule, Component, ViewChild } from '@angular/core'; -import { App, AlertController, Content, DeepLinkConfig, IonicApp, IonicModule, NavController, NavParams, Tabs, Tab, ModalController, ViewController } from '../../../../../ionic-angular'; - -@Component({ - selector: 'my-cmp2', - template: `{{value}}` -}) -export class MyCmpTest2 { - value: string = 'Test Failed'; -} - -@Component({ - selector: 'my-cmp', - template: ` {{value}}` -}) -export class MyCmpTest { - @ViewChild(MyCmpTest2) _label: MyCmpTest2; - label: MyCmpTest2; - value: string = 'Test Failed'; - - ngOnInit() { - this.label = this._label; - } -} - - -@Component({ - template: ` - - - {{title}} - - - - - - - - - -
-

ionViewCanEnter ({{called.ionViewCanEnter}})

-

ionViewCanLeave ({{called.ionViewCanLeave}})

-

ionViewWillLoad ({{called.ionViewWillLoad}})

-

ionViewDidLoad ({{called.ionViewDidLoad}})

-

ionViewWillEnter ({{called.ionViewWillEnter}})

-

ionViewDidEnter ({{called.ionViewDidEnter}})

-

ionViewWillLeave ({{called.ionViewWillLeave}})

-

ionViewDidLeave ({{called.ionViewDidLeave}})

- -
- - - {{title}} - - Push to FullPage - - - - - - Text Input - - - - - - - - - - Toggle Can Leave - - - - - - - - - - - ` -}) -export class FirstPage { - pushPage = FullPage; - firstPage = FirstPage; - title = 'First Page'; - pages: Array = []; - @ViewChild(Content) content: Content; - @ViewChild(MyCmpTest) myCmp: MyCmpTest; - canLeave = true; - called: any; - - constructor( - public navCtrl: NavController, - public viewCtrl: ViewController, - public alertCtrl: AlertController - ) { - this.called = { - ionViewCanEnter: 0, - ionViewCanLeave: 0, - ionViewWillLoad: 0, - ionViewDidLoad: 0, - ionViewWillEnter: 0, - ionViewDidEnter: 0, - ionViewWillLeave: 0, - ionViewDidLeave: 0 - }; - } - - ionViewWillLoad() { - console.log('ionViewWillLoad, FirstPage', this.viewCtrl.id); - this.called.ionViewWillLoad++; - } - - ionViewDidLoad() { - console.log('ionViewDidLoad, FirstPage'); - for (var i = 1; i <= 50; i++) { - this.pages.push(i); - } - if (!this.myCmp || !this.content || !this.myCmp.label) { - throw new Error('children are not loaded'); - } - this.myCmp.value = '👍 self test passed!'; - this.myCmp.label.value = '👍 children test passed!'; - this.called.ionViewDidLoad++; - } - - ionViewWillEnter() { - console.log('ionViewWillEnter, FirstPage', this.viewCtrl.id); - this.called.ionViewWillEnter++; - } - - ionViewDidEnter() { - console.log('ionViewDidEnter, FirstPage', this.viewCtrl.id); - this.called.ionViewDidEnter++; - } - - ionViewWillLeave() { - console.log('ionViewWillLeave, FirstPage', this.viewCtrl.id); - this.called.ionViewWillLeave++; - } - - ionViewDidLeave() { - console.log('ionViewDidLeave, FirstPage', this.viewCtrl.id); - this.called.ionViewDidLeave++; - } - - ionViewWillUnload() { - console.log('ionViewWillUnload, FirstPage', this.viewCtrl.id); - this.called.ionViewWillUnload++; - } - - ionViewCanLeave() { - if (this.canLeave) { - return true; - } - - let alert = this.alertCtrl.create(); - alert.setMessage('You can check-out any time you like, but you can never leave.'); - alert.addButton({ text: 'Umm, ok', role: 'cancel', }); - alert.present(); - - this.called.ionViewCanLeave++; - - return false; - } - - ionViewCanEnter() { - this.called.ionViewCanEnter++; - return true; - } - - setPages() { - let items = [ - { page: PrimaryHeaderPage } - ]; - - this.navCtrl.setPages(items); - } - - setRoot() { - this.navCtrl.setRoot(PrimaryHeaderPage); - } - - pushPrimaryHeaderPage() { - this.navCtrl.push(PrimaryHeaderPage, null, { - animate: true, - animation: 'ios-transition' - }).then(() => { }, (rejectReason: string) => { - }); - } - - pushRedirect() { - this.navCtrl.push(RedirectPage).then(() => { }, (rejectReason: string) => { - }); - } - - pushFullPage() { - this.navCtrl.push(FullPage, { id: 8675309, myData: [1, 2, 3, 4] }, { - animate: true, - animation: 'md-transition' - }).catch(() => { - }); - } - - pushAnother() { - this.navCtrl.push(AnotherPage, null, { - animate: true, - animation: 'wp-transition' - }).catch(() => { - }); - } - - pushTabsPage() { - this.navCtrl.push(TabsPage).catch(() => { - }); - } - - - quickPush() { - this.navCtrl.push(AnotherPage).catch(() => { - }); - setTimeout(() => { - this.navCtrl.push(PrimaryHeaderPage).catch(() => { - }); - }, 150); - } - - quickPop() { - this.navCtrl.push(AnotherPage).catch(() => { - }); - setTimeout(() => { - this.navCtrl.remove(1, 1).catch(() => { - }); - }, 250); - } - - pop() { - this.navCtrl.pop().catch(() => {}); - } - - viewDismiss() { - this.viewCtrl.dismiss(); - } - - reload() { - window.location.reload(); - } - - scrollToTop() { - this.content.scrollToTop(); - } - - scrollToBottom() { - this.content.scrollToBottom(1000); - } -} - - -@Component({template: ''}) -export class RedirectPage { - constructor(public navCtrl: NavController) { } - ionViewDidEnter() { - this.navCtrl.push(PrimaryHeaderPage); - } -} - -@Component({ - template: ` - -

Full page

-

This page does not have a nav bar!

-

-

-

-

-

-

-

- - ` -}) -export class FullPage { - constructor( - public navCtrl: NavController, - public viewCtrl: ViewController, - public app: App, - public alertCtrl: AlertController, - public params: NavParams - ) {} - - ionViewDidLoad() { - console.log('ionViewDidLoad, FullPage', this.viewCtrl.id); - } - - ionViewWillEnter() { - console.log('ionViewWillEnter, FullPage', this.viewCtrl.id); - } - - ionViewDidEnter() { - console.log('ionViewDidEnter, FullPage', this.viewCtrl.id); - } - - ionViewWillLeave() { - console.log('ionViewWillLeave, FullPage', this.viewCtrl.id); - } - - ionViewDidLeave() { - console.log('ionViewDidLeave, FullPage', this.viewCtrl.id); - } - - ionViewWillUnload() { - console.log('ionViewWillUnload, FullPage', this.viewCtrl.id); - } - - setPages() { - let items = [ - { page: FirstPage }, - { page: PrimaryHeaderPage } - ]; - - this.navCtrl.setPages(items); - } - - pushPrimaryHeaderPage() { - this.navCtrl.push(PrimaryHeaderPage); - } - - pushAnother() { - this.navCtrl.push(AnotherPage); - } - - pushFirstPage() { - this.navCtrl.push(FirstPage); - } - - presentAlert() { - let alert = this.alertCtrl.create(); - alert.setTitle('Hello Alert'); - alert.setMessage('Dismiss this alert, then pop one page'); - alert.addButton({ - text: 'Dismiss', - role: 'cancel', - handler: () => { - // overlays are added and removed from the app root's portal - // in the example below, alert.dismiss() dismisses the alert - // from the app root portal, and once it's done transitioning out, - // this the active page is popped from the nav - alert.dismiss().then(() => { - this.navCtrl.pop(); - }); - - // by default an alert will dismiss itself - // however, we don't want to use the default - // but rather fire off our own pop navigation - // return false so it doesn't pop automatically - return false; - } - }); - alert.present(); - } - -} - - -@Component({ - template: ` - - - Primary Color Page Header - - - - - - {{subheader}} - - - -

-

-

-

-

-

-

-
- - -
- - - - I'm a sub footer! - - - Footer - - - ` -}) -export class PrimaryHeaderPage { - subheader: string; - - constructor( - public navCtrl: NavController, - public alertCtrl: AlertController, - public viewCtrl: ViewController - ) {} - - ionViewDidLoad() { - console.log('ionViewDidLoad, PrimaryHeaderPage', this.viewCtrl.id); - } - - ionViewWillEnter() { - console.log('ionViewWillEnter, PrimaryHeaderPage', this.viewCtrl.id); - this.viewCtrl.setBackButtonText('Previous'); - this.subheader = 'I\'m a sub header!'; - } - - ionViewDidEnter() { - console.log('ionViewDidEnter, PrimaryHeaderPage', this.viewCtrl.id); - } - - ionViewWillLeave() { - console.log('ionViewWillLeave, PrimaryHeaderPage', this.viewCtrl.id); - } - - ionViewDidLeave() { - console.log('ionViewDidLeave, PrimaryHeaderPage', this.viewCtrl.id); - } - - ionViewWillUnload() { - console.log('ionViewWillUnload, PrimaryHeaderPage', this.viewCtrl.id); - } - - pushAnother() { - this.navCtrl.push(AnotherPage); - } - - pushFullPage() { - this.navCtrl.push(FullPage, { id: 8675309, myData: [1, 2, 3, 4] }); - } - - insert() { - this.navCtrl.insert(2, FirstPage); - } - - removeSecond() { - this.navCtrl.remove(1); - } - - setRoot() { - this.navCtrl.setRoot(AnotherPage); - } - - presentAlert() { - let alert = this.alertCtrl.create(); - alert.setTitle('Hello Alert'); - alert.addButton({ text: 'Dismiss', role: 'cancel', }); - alert.present(); - } -} - - -@Component({ - template: ` - - - Another Page Header - - - - - I'm a sub header in the content! - - - - Text Input - - - Back button hidden w/ ion-navbar hideBackButton - - - - - - - -
- - - I'm a sub footer in the content! - - - And I'm a sub footer in the content too! - - - - - Another Page Footer - - - ` -}) -export class AnotherPage { - bbHideToggleVal = false; - bbCount = 0; - - constructor( - public navCtrl: NavController, - public viewCtrl: ViewController - ) { } - - ionViewDidLoad() { - console.log('ionViewDidLoad, AnotherPage', this.viewCtrl.id); - } - - ionViewWillEnter() { - console.log('ionViewWillEnter, AnotherPage', this.viewCtrl.id); - } - - ionViewDidEnter() { - console.log('ionViewDidEnter, AnotherPage', this.viewCtrl.id); - } - - ionViewWillLeave() { - console.log('ionViewWillLeave, AnotherPage', this.viewCtrl.id); - } - - ionViewDidLeave() { - console.log('ionViewDidLeave, AnotherPage', this.viewCtrl.id); - } - - ionViewWillUnload() { - console.log('ionViewWillUnload, AnotherPage', this.viewCtrl.id); - } - - pushFullPage() { - this.navCtrl.push(FullPage); - } - - pushPrimaryHeaderPage() { - this.navCtrl.push(PrimaryHeaderPage); - } - - pushFirstPage() { - this.navCtrl.push(FirstPage); - } - - setRoot() { - this.navCtrl.setRoot(FirstPage); - } - - toggleBackButton() { - this.bbHideToggleVal = !this.bbHideToggleVal; - this.viewCtrl.showBackButton(this.bbHideToggleVal); - } - - setBackButtonText() { - let backButtonText = 'Messages'; - - if (this.bbCount > 0) { - backButtonText += ` (${this.bbCount})`; - } - - this.viewCtrl.setBackButtonText(backButtonText); - ++this.bbCount; - } - -} - -// -// Tab 1 -// -@Component({ - template: ` - - - Heart - - - - - - - Tab 1 - - - - - Item {{i}} {{i}} {{i}} {{i}} - -

- -

-

- -

- - ` -}) -export class Tab1 { - items: any[] = []; - - constructor(private tabs: Tabs, private app: App, private nav: NavController) { - for (var i = 1; i <= 250; i++) { - this.items.push(i); - } - } - - goBack() { - this.nav.parent.parent.pop(); - } - - goTo() { - this.nav.push(TabItemPage); - } - - selectPrevious() { - this.tabs.select(this.tabs.previousTab()); - } - - appNavPop() { - this.app.navPop(); - } -} - -// -// Tab 2 -// -@Component({ - template: ` - - - Schedule - - - - - - - -

{{session.name}} {{session.name}} {{session.name}}

-

{{session.location}} {{session.location}} {{session.location}}

- - - - - - - -

- -

-

- -

- - ` -}) -export class Tab2 { - sessions: any[] = []; - - constructor(private tabs: Tabs, private app: App) { - for (var i = 1; i <= 250; i++) { - this.sessions.push({ - name: 'Name ' + i, - location: 'Location: ' + i - }); - } - } - - selectPrevious() { - this.tabs.select(this.tabs.previousTab()); - } - - appNavPop() { - this.app.navPop(); - } -} - -// -// Tab 3 -// -@Component({ - template: ` - - - - Stopwatch - - - - -

Tab 3

-

- - -

-

- -

-

- -

- - ` -}) -export class Tab3 { - constructor(private alertCtrl: AlertController, private modalCtrl: ModalController, private tabs: Tabs, private app: App) {} - - presentAlert() { - let alert = this.alertCtrl.create({ - title: 'Alert Title!', - buttons: ['Dismiss'] - }); - alert.present(); - } - - presentModal() { - // this.modalCtrl.create(MyModal).present(); - } - - selectPrevious() { - this.tabs.select(this.tabs.previousTab()); - } - - appNavPop() { - this.app.navPop(); - } -} - - -@Component({ - template: ` - - - - Menu - - - - - - - - - - - - - - - - - ` -}) -export class TabsPage { - root1 = Tab1; - root2 = Tab2; - root3 = Tab3; - - onChange(ev: Tab) { - console.log('Changed tab', ev); - } - - onSelect(ev: Tab) { - console.log('Selected tab', ev); - } -} - -@Component({ - template: ` - - - Tab Item - - - - -

Hello moto

- - ` -}) -export class TabItemPage { - items: any[] = []; - - constructor(private tabs: Tabs, private app: App) { - } -} - - -@Component({ - template: `` -}) -export class E2EApp { - root = FirstPage; -} - - -export const deepLinkConfig: DeepLinkConfig = { - links: [ - { component: FirstPage, name: 'first-page' }, - { component: AnotherPage, name: 'another-page' }, - { component: MyCmpTest, name: 'tab1-page1' }, - { component: FullPage, name: 'full-page', defaultHistory: ['first-page', 'another-page'] }, - { component: PrimaryHeaderPage, name: 'primary-header-page', defaultHistory: ['first-page', 'full-page'] }, - { component: Tabs, name: 'tabs' }, - { component: Tab1, name: 'tab1' }, - { component: TabItemPage, name: 'item' } - ] -}; - -@NgModule({ - declarations: [ - E2EApp, - FirstPage, - RedirectPage, - AnotherPage, - MyCmpTest, - MyCmpTest2, - FullPage, - PrimaryHeaderPage, - TabsPage, - Tab1, - Tab2, - Tab3, - TabItemPage - ], - imports: [ - IonicModule.forRoot(E2EApp, { - swipeBackEnabled: true - }, deepLinkConfig) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - FirstPage, - RedirectPage, - AnotherPage, - FullPage, - PrimaryHeaderPage, - TabsPage, - Tab1, - Tab2, - Tab3, - TabItemPage - ] -}) -export class AppModule {} diff --git a/src/components/nav/test/basic/app/app.component.ts b/src/components/nav/test/basic/app/app.component.ts new file mode 100644 index 0000000000..9341f7ccf8 --- /dev/null +++ b/src/components/nav/test/basic/app/app.component.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; +import { FirstPage} from '../pages/first-page/first-page'; + +@Component({ + template: `` +}) +export class E2EApp { + root = FirstPage; +} diff --git a/src/components/nav/test/basic/app/app.module.ts b/src/components/nav/test/basic/app/app.module.ts new file mode 100644 index 0000000000..edf18280a2 --- /dev/null +++ b/src/components/nav/test/basic/app/app.module.ts @@ -0,0 +1,41 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { E2EApp } from './app.component'; +import { FirstPage } from '../pages/first-page/first-page'; +import { MyCmpTest } from '../pages/first-page/my-component'; +import { MyCmpTest2 } from '../pages/first-page/my-component-two'; + + +@NgModule({ + declarations: [ + E2EApp, + FirstPage, + MyCmpTest, + MyCmpTest2 + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp, { swipeBackEnabled: true }, { + links: [ + { name: 'first-page', component: FirstPage }, + { name: 'another-page', loadChildren: '../pages/another-page/another-page.module#AnotherPageModule' }, + { name: 'full-page', loadChildren: '../pages/full-page/full-page.module#FullPageModule', defaultHistory: ['first-page', 'another-page'] }, + { name: 'primary-header-page', loadChildren: '../pages/primary-header-page/primary-header-page.module#PrimaryHeaderPageModule' }, + { name: 'redirect-page', loadChildren: '../pages/redirect-page/redirect-page.module#RedirectPageModule' }, + { name: 'tab-item-page', loadChildren: '../pages/tab-item-page/tab-item-page.module#TabItemPageModule' }, + { name: 'tabs', loadChildren: '../pages/tabs/tabs.module#TabsPageModule' }, + { name: 'tab-one', loadChildren: '../pages/tab-one/tab-one.module#Tab1Module' }, + { name: 'tab-two', loadChildren: '../pages/tab-two/tab-two.module#Tab2Module' }, + { name: 'tab-three', loadChildren: '../pages/tab-three/tab-three.module#Tab3Module' }, + ] + }) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + FirstPage + ] +}) +export class AppModule {} diff --git a/src/components/nav/test/basic/app/main.ts b/src/components/nav/test/basic/app/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/nav/test/basic/app/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/nav/test/basic/e2e.ts b/src/components/nav/test/basic/e2e.ts index bf022c3ae7..9abaf539cd 100644 --- a/src/components/nav/test/basic/e2e.ts +++ b/src/components/nav/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should go from 1 to 2', function() { element(by.css('.e2eFrom1To2')).click(); diff --git a/src/components/nav/test/basic/pages/another-page/another-page.module.ts b/src/components/nav/test/basic/pages/another-page/another-page.module.ts new file mode 100644 index 0000000000..18d6c9037c --- /dev/null +++ b/src/components/nav/test/basic/pages/another-page/another-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; +import { AnotherPage } from './another-page'; + + +@NgModule({ + imports: [ + DeepLinkModule.forChild(AnotherPage) + ], + declarations: [ + AnotherPage + ], + entryComponents: [ + AnotherPage, + ] +}) +export class AnotherPageModule { } diff --git a/src/components/nav/test/basic/pages/another-page/another-page.ts b/src/components/nav/test/basic/pages/another-page/another-page.ts new file mode 100644 index 0000000000..b5db5d1cf2 --- /dev/null +++ b/src/components/nav/test/basic/pages/another-page/another-page.ts @@ -0,0 +1,110 @@ +import { Component } from '@angular/core'; +import { NavController, ViewController } from '../../../../../..'; + + +@Component({ + template: ` + + + Another Page Header + + + + + I'm a sub header in the content! + + + + Text Input + + + Back button hidden w/ ion-navbar hideBackButton + + + + + + + +
+ + + I'm a sub footer in the content! + + + And I'm a sub footer in the content too! + + + + + Another Page Footer + + + ` +}) +export class AnotherPage { + bbHideToggleVal = false; + bbCount = 0; + + constructor( + public navCtrl: NavController, + public viewCtrl: ViewController + ) { } + + ionViewDidLoad() { + console.log('ionViewDidLoad, AnotherPage', this.viewCtrl.id); + } + + ionViewWillEnter() { + console.log('ionViewWillEnter, AnotherPage', this.viewCtrl.id); + } + + ionViewDidEnter() { + console.log('ionViewDidEnter, AnotherPage', this.viewCtrl.id); + } + + ionViewWillLeave() { + console.log('ionViewWillLeave, AnotherPage', this.viewCtrl.id); + } + + ionViewDidLeave() { + console.log('ionViewDidLeave, AnotherPage', this.viewCtrl.id); + } + + ionViewWillUnload() { + console.log('ionViewWillUnload, AnotherPage', this.viewCtrl.id); + } + + pushFullPage() { + this.navCtrl.push('full-page'); + } + + pushPrimaryHeaderPage() { + this.navCtrl.push('primary-header-page'); + } + + pushFirstPage() { + this.navCtrl.push('first-page'); + } + + setRoot() { + this.navCtrl.setRoot('first-page'); + } + + toggleBackButton() { + this.bbHideToggleVal = !this.bbHideToggleVal; + this.viewCtrl.showBackButton(this.bbHideToggleVal); + } + + setBackButtonText() { + let backButtonText = 'Messages'; + + if (this.bbCount > 0) { + backButtonText += ` (${this.bbCount})`; + } + + this.viewCtrl.setBackButtonText(backButtonText); + ++this.bbCount; + } + +} diff --git a/src/components/nav/test/basic/pages/first-page/first-page.ts b/src/components/nav/test/basic/pages/first-page/first-page.ts new file mode 100644 index 0000000000..84c183e4a8 --- /dev/null +++ b/src/components/nav/test/basic/pages/first-page/first-page.ts @@ -0,0 +1,242 @@ +import { Component, ViewChild } from '@angular/core'; +import { AlertController, Content, NavController, ViewController } from '../../../../../..'; + +import { MyCmpTest } from './my-component'; + +@Component({ + template: ` + + + {{title}} + + + + + + + + + +
+

ionViewCanEnter ({{called.ionViewCanEnter}})

+

ionViewCanLeave ({{called.ionViewCanLeave}})

+

ionViewWillLoad ({{called.ionViewWillLoad}})

+

ionViewDidLoad ({{called.ionViewDidLoad}})

+

ionViewWillEnter ({{called.ionViewWillEnter}})

+

ionViewDidEnter ({{called.ionViewDidEnter}})

+

ionViewWillLeave ({{called.ionViewWillLeave}})

+

ionViewDidLeave ({{called.ionViewDidLeave}})

+ +
+ + + {{title}} + + Push to FullPage + + + + + + + + + + + + Text Input + + + + Toggle Can Leave + + + + + + + + + + + ` +}) +export class FirstPage { + + pushPage = 'another-page'; + firstPage = FirstPage; + + title = 'First Page'; + pages: Array = []; + + @ViewChild(Content) content: Content; + @ViewChild(MyCmpTest) myCmp: MyCmpTest; + + canLeave = true; + called: any; + + constructor( + public navCtrl: NavController, + public viewCtrl: ViewController, + public alertCtrl: AlertController + ) { + this.called = { + ionViewCanEnter: 0, + ionViewCanLeave: 0, + ionViewWillLoad: 0, + ionViewDidLoad: 0, + ionViewWillEnter: 0, + ionViewDidEnter: 0, + ionViewWillLeave: 0, + ionViewDidLeave: 0 + }; + } + + ionViewWillLoad() { + console.log('ionViewWillLoad, FirstPage', this.viewCtrl.id); + this.called.ionViewWillLoad++; + } + + ionViewDidLoad() { + console.log('ionViewDidLoad, FirstPage'); + for (var i = 1; i <= 50; i++) { + this.pages.push(i); + } + if (!this.myCmp || !this.content || !this.myCmp.label) { + throw new Error('children are not loaded'); + } + this.myCmp.value = '👍 self test passed!'; + this.myCmp.label.value = '👍 children test passed!'; + this.called.ionViewDidLoad++; + } + + ionViewWillEnter() { + console.log('ionViewWillEnter, FirstPage', this.viewCtrl.id); + this.called.ionViewWillEnter++; + } + + ionViewDidEnter() { + console.log('ionViewDidEnter, FirstPage', this.viewCtrl.id); + this.called.ionViewDidEnter++; + } + + ionViewWillLeave() { + console.log('ionViewWillLeave, FirstPage', this.viewCtrl.id); + this.called.ionViewWillLeave++; + } + + ionViewDidLeave() { + console.log('ionViewDidLeave, FirstPage', this.viewCtrl.id); + this.called.ionViewDidLeave++; + } + + ionViewWillUnload() { + console.log('ionViewWillUnload, FirstPage', this.viewCtrl.id); + this.called.ionViewWillUnload++; + } + + ionViewCanLeave() { + if (this.canLeave) { + return true; + } + + let alert = this.alertCtrl.create(); + alert.setMessage('You can check-out any time you like, but you can never leave.'); + alert.addButton({ text: 'Umm, ok', role: 'cancel', }); + alert.present(); + + this.called.ionViewCanLeave++; + + return false; + } + + ionViewCanEnter() { + this.called.ionViewCanEnter++; + return true; + } + + setPages() { + let items = [ + { page: 'primary-header-page' } + ]; + + this.navCtrl.setPages(items); + } + + setRoot() { + this.navCtrl.setRoot('primary-header-page'); + } + + pushPrimaryHeaderPage() { + this.navCtrl.push('primary-header-page', null, { + animate: true, + animation: 'ios-transition' + }).then(() => { }, (rejectReason: string) => { + }); + } + + pushRedirect() { + this.navCtrl.push('redirect-page').then(() => { }, (rejectReason: string) => { + }); + } + + pushFullPage() { + this.navCtrl.push('full-page', { id: 8675309, myData: [1, 2, 3, 4] }, { + animate: true, + animation: 'md-transition' + }).catch(() => { + }); + } + + pushAnother() { + this.navCtrl.push('another-page', null, { + animate: true, + animation: 'wp-transition' + }).catch(() => { + }); + } + + pushTabsPage() { + this.navCtrl.push('tabs').catch(() => { + }); + } + + + quickPush() { + this.navCtrl.push('another-page').catch(() => { + }); + setTimeout(() => { + this.navCtrl.push('primary-header-page').catch(() => { + }); + }, 150); + } + + quickPop() { + this.navCtrl.push('another-page').catch(() => { + }); + setTimeout(() => { + this.navCtrl.remove(1, 1).catch(() => { + }); + }, 250); + } + + pop() { + this.navCtrl.pop().catch(() => {}); + } + + viewDismiss() { + this.viewCtrl.dismiss(); + } + + reload() { + window.location.reload(); + } + + scrollToTop() { + this.content.scrollToTop(); + } + + scrollToBottom() { + this.content.scrollToBottom(1000); + } +} diff --git a/src/components/nav/test/basic/pages/first-page/my-component-two.ts b/src/components/nav/test/basic/pages/first-page/my-component-two.ts new file mode 100644 index 0000000000..a4c3cb683e --- /dev/null +++ b/src/components/nav/test/basic/pages/first-page/my-component-two.ts @@ -0,0 +1,9 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'my-cmp2', + template: `{{value}}` +}) +export class MyCmpTest2 { + value: string = 'Test Failed'; +} diff --git a/src/components/nav/test/basic/pages/first-page/my-component.ts b/src/components/nav/test/basic/pages/first-page/my-component.ts new file mode 100644 index 0000000000..4d75cef364 --- /dev/null +++ b/src/components/nav/test/basic/pages/first-page/my-component.ts @@ -0,0 +1,18 @@ +import { Component, ViewChild } from '@angular/core'; +import { MyCmpTest2 } from './my-component-two'; + +@Component({ + selector: 'my-cmp', + template: ` {{value}}` +}) +export class MyCmpTest { + + @ViewChild(MyCmpTest2) _label: MyCmpTest2; + + label: MyCmpTest2; + value: string = 'Test Failed'; + + ngOnInit() { + this.label = this._label; + } +} diff --git a/src/components/nav/test/basic/pages/full-page/full-page.module.ts b/src/components/nav/test/basic/pages/full-page/full-page.module.ts new file mode 100644 index 0000000000..378e1a0ef1 --- /dev/null +++ b/src/components/nav/test/basic/pages/full-page/full-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; +import { FullPage } from './full-page'; + + +@NgModule({ + imports: [ + DeepLinkModule.forChild(FullPage) + ], + declarations: [ + FullPage + ], + entryComponents: [ + FullPage, + ] +}) +export class FullPageModule { } diff --git a/src/components/nav/test/basic/pages/full-page/full-page.ts b/src/components/nav/test/basic/pages/full-page/full-page.ts new file mode 100644 index 0000000000..33c79ad710 --- /dev/null +++ b/src/components/nav/test/basic/pages/full-page/full-page.ts @@ -0,0 +1,100 @@ +import { Component } from '@angular/core'; +import { App, AlertController, NavController, NavParams, ViewController } from '../../../../../..'; + + +@Component({ + template: ` + +

Full page

+

This page does not have a nav bar!

+

+

+

+

+

+

+

+ + ` +}) +export class FullPage { + constructor( + public navCtrl: NavController, + public viewCtrl: ViewController, + public app: App, + public alertCtrl: AlertController, + public params: NavParams + ) {} + + ionViewDidLoad() { + console.log('ionViewDidLoad, FullPage', this.viewCtrl.id); + } + + ionViewWillEnter() { + console.log('ionViewWillEnter, FullPage', this.viewCtrl.id); + } + + ionViewDidEnter() { + console.log('ionViewDidEnter, FullPage', this.viewCtrl.id); + } + + ionViewWillLeave() { + console.log('ionViewWillLeave, FullPage', this.viewCtrl.id); + } + + ionViewDidLeave() { + console.log('ionViewDidLeave, FullPage', this.viewCtrl.id); + } + + ionViewWillUnload() { + console.log('ionViewWillUnload, FullPage', this.viewCtrl.id); + } + + setPages() { + let items = [ + { page: 'first-page' }, + { page: 'primary-header-page' } + ]; + + this.navCtrl.setPages(items); + } + + pushPrimaryHeaderPage() { + this.navCtrl.push('primary-header-page'); + } + + pushAnother() { + this.navCtrl.push('another-page'); + } + + pushFirstPage() { + this.navCtrl.push('first-page'); + } + + presentAlert() { + let alert = this.alertCtrl.create(); + alert.setTitle('Hello Alert'); + alert.setMessage('Dismiss this alert, then pop one page'); + alert.addButton({ + text: 'Dismiss', + role: 'cancel', + handler: () => { + // overlays are added and removed from the app root's portal + // in the example below, alert.dismiss() dismisses the alert + // from the app root portal, and once it's done transitioning out, + // this the active page is popped from the nav + alert.dismiss().then(() => { + this.navCtrl.pop(); + }); + + // by default an alert will dismiss itself + // however, we don't want to use the default + // but rather fire off our own pop navigation + // return false so it doesn't pop automatically + return false; + } + }); + alert.present(); + } + +} diff --git a/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.module.ts b/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.module.ts new file mode 100644 index 0000000000..5e8a4356ba --- /dev/null +++ b/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; +import { PrimaryHeaderPage } from './primary-header-page'; + + +@NgModule({ + imports: [ + DeepLinkModule.forChild(PrimaryHeaderPage) + ], + declarations: [ + PrimaryHeaderPage + ], + entryComponents: [ + PrimaryHeaderPage, + ] +}) +export class PrimaryHeaderPageModule { } diff --git a/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts b/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts new file mode 100644 index 0000000000..b518124072 --- /dev/null +++ b/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts @@ -0,0 +1,101 @@ +import { Component } from '@angular/core'; +import { AlertController, NavController, ViewController } from '../../../../../..'; + +@Component({ + template: ` + + + Primary Color Page Header + + + + + + {{subheader}} + + + +

+

+

+

+

+

+

+
+ + +
+ + + + I'm a sub footer! + + + Footer + + + ` +}) +export class PrimaryHeaderPage { + subheader: string; + + constructor( + public navCtrl: NavController, + public alertCtrl: AlertController, + public viewCtrl: ViewController + ) {} + + ionViewDidLoad() { + console.log('ionViewDidLoad, PrimaryHeaderPage', this.viewCtrl.id); + } + + ionViewWillEnter() { + console.log('ionViewWillEnter, PrimaryHeaderPage', this.viewCtrl.id); + this.viewCtrl.setBackButtonText('Previous'); + this.subheader = 'I\'m a sub header!'; + } + + ionViewDidEnter() { + console.log('ionViewDidEnter, PrimaryHeaderPage', this.viewCtrl.id); + } + + ionViewWillLeave() { + console.log('ionViewWillLeave, PrimaryHeaderPage', this.viewCtrl.id); + } + + ionViewDidLeave() { + console.log('ionViewDidLeave, PrimaryHeaderPage', this.viewCtrl.id); + } + + ionViewWillUnload() { + console.log('ionViewWillUnload, PrimaryHeaderPage', this.viewCtrl.id); + } + + pushAnother() { + this.navCtrl.push('another-page'); + } + + pushFullPage() { + this.navCtrl.push('full-page', { id: 8675309, myData: [1, 2, 3, 4] }); + } + + insert() { + this.navCtrl.insert(2, 'first-page'); + } + + removeSecond() { + this.navCtrl.remove(1); + } + + setRoot() { + this.navCtrl.setRoot('another-page'); + } + + presentAlert() { + let alert = this.alertCtrl.create(); + alert.setTitle('Hello Alert'); + alert.addButton({ text: 'Dismiss', role: 'cancel', }); + alert.present(); + } +} diff --git a/src/components/nav/test/basic/pages/redirect-page/redirect-page.module.ts b/src/components/nav/test/basic/pages/redirect-page/redirect-page.module.ts new file mode 100644 index 0000000000..8d92bfa020 --- /dev/null +++ b/src/components/nav/test/basic/pages/redirect-page/redirect-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; +import { RedirectPage } from './redirect-page'; + + +@NgModule({ + imports: [ + DeepLinkModule.forChild(RedirectPage) + ], + declarations: [ + RedirectPage + ], + entryComponents: [ + RedirectPage, + ] +}) +export class RedirectPageModule { } diff --git a/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts b/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts new file mode 100644 index 0000000000..5382e42b0e --- /dev/null +++ b/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; +import { NavController } from '../../../../../..'; + +@Component({ + template: '' +}) +export class RedirectPage { + constructor(public navCtrl: NavController) { } + ionViewDidEnter() { + this.navCtrl.push('primary-header-page'); + } +} diff --git a/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.module.ts b/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.module.ts new file mode 100644 index 0000000000..eceb4669bb --- /dev/null +++ b/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; +import { TabItemPage } from './tab-item-page'; + + +@NgModule({ + imports: [ + DeepLinkModule.forChild(TabItemPage) + ], + declarations: [ + TabItemPage + ], + entryComponents: [ + TabItemPage, + ] +}) +export class TabItemPageModule { } diff --git a/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts b/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts new file mode 100644 index 0000000000..2b6de2d57b --- /dev/null +++ b/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts @@ -0,0 +1,23 @@ +import { Component } from '@angular/core'; +import { App, Tabs} from '../../../../../..'; + +@Component({ + template: ` + + + Tab Item + + + + +

Hello moto

+ + ` +}) +export class TabItemPage { + items: any[] = []; + + constructor(private tabs: Tabs, private app: App) { + } +} + diff --git a/src/components/nav/test/basic/pages/tab-one/tab-one.module.ts b/src/components/nav/test/basic/pages/tab-one/tab-one.module.ts new file mode 100644 index 0000000000..50704d9daf --- /dev/null +++ b/src/components/nav/test/basic/pages/tab-one/tab-one.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; +import { Tab1 } from './tab-one'; + + +@NgModule({ + imports: [ + DeepLinkModule.forChild(Tab1) + ], + declarations: [ + Tab1 + ], + entryComponents: [ + Tab1, + ] +}) +export class Tab1Module { } diff --git a/src/components/nav/test/basic/pages/tab-one/tab-one.ts b/src/components/nav/test/basic/pages/tab-one/tab-one.ts new file mode 100644 index 0000000000..e6e4ccc4bc --- /dev/null +++ b/src/components/nav/test/basic/pages/tab-one/tab-one.ts @@ -0,0 +1,55 @@ +import { Component } from '@angular/core'; +import { App, NavController, Tabs } from '../../../../../..'; + +@Component({ + template: ` + + + Heart + + + + + + + Tab 1 + + + + + Item {{i}} {{i}} {{i}} {{i}} + +

+ +

+

+ +

+ + ` +}) +export class Tab1 { + items: any[] = []; + + constructor(private tabs: Tabs, private app: App, private nav: NavController) { + for (var i = 1; i <= 250; i++) { + this.items.push(i); + } + } + + goBack() { + this.nav.parent.parent.pop(); + } + + goTo() { + this.nav.push('tab-item-page'); + } + + selectPrevious() { + this.tabs.select(this.tabs.previousTab()); + } + + appNavPop() { + this.app.navPop(); + } +} diff --git a/src/components/nav/test/basic/pages/tab-three/tab-three.module.ts b/src/components/nav/test/basic/pages/tab-three/tab-three.module.ts new file mode 100644 index 0000000000..6d472e3f18 --- /dev/null +++ b/src/components/nav/test/basic/pages/tab-three/tab-three.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; +import { Tab3 } from './tab-three'; + + +@NgModule({ + imports: [ + DeepLinkModule.forChild(Tab3) + ], + declarations: [ + Tab3 + ], + entryComponents: [ + Tab3, + ] +}) +export class Tab3Module { } diff --git a/src/components/nav/test/basic/pages/tab-three/tab-three.ts b/src/components/nav/test/basic/pages/tab-three/tab-three.ts new file mode 100644 index 0000000000..63ab6e06ce --- /dev/null +++ b/src/components/nav/test/basic/pages/tab-three/tab-three.ts @@ -0,0 +1,52 @@ +import { Component } from '@angular/core'; +import { AlertController, App, ModalController, Tabs } from '../../../../../..'; + +@Component({ + template: ` + + + + Stopwatch + + + + +

Tab 3

+

+ + +

+

+ +

+

+ +

+ + ` +}) +export class Tab3 { + constructor(private alertCtrl: AlertController, private modalCtrl: ModalController, private tabs: Tabs, private app: App) {} + + presentAlert() { + let alert = this.alertCtrl.create({ + title: 'Alert Title!', + buttons: ['Dismiss'] + }); + alert.present(); + } + + presentModal() { + // this.modalCtrl.create(MyModal).present(); + } + + selectPrevious() { + this.tabs.select(this.tabs.previousTab()); + } + + appNavPop() { + this.app.navPop(); + } +} diff --git a/src/components/nav/test/basic/pages/tab-two/tab-two.module.ts b/src/components/nav/test/basic/pages/tab-two/tab-two.module.ts new file mode 100644 index 0000000000..a8875c41a4 --- /dev/null +++ b/src/components/nav/test/basic/pages/tab-two/tab-two.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; +import { Tab2 } from './tab-two'; + + +@NgModule({ + imports: [ + DeepLinkModule.forChild(Tab2) + ], + declarations: [ + Tab2 + ], + entryComponents: [ + Tab2, + ] +}) +export class Tab2Module { } diff --git a/src/components/nav/test/basic/pages/tab-two/tab-two.ts b/src/components/nav/test/basic/pages/tab-two/tab-two.ts new file mode 100644 index 0000000000..c7f7a11bf5 --- /dev/null +++ b/src/components/nav/test/basic/pages/tab-two/tab-two.ts @@ -0,0 +1,53 @@ +import { Component } from '@angular/core'; +import { App, Tabs } from '../../../../../..'; + +@Component({ + template: ` + + + Schedule + + + + + + + +

{{session.name}} {{session.name}} {{session.name}}

+

{{session.location}} {{session.location}} {{session.location}}

+ + + + + + + +

+ +

+

+ +

+ + ` +}) +export class Tab2 { + sessions: any[] = []; + + constructor(private tabs: Tabs, private app: App) { + for (var i = 1; i <= 250; i++) { + this.sessions.push({ + name: 'Name ' + i, + location: 'Location: ' + i + }); + } + } + + selectPrevious() { + this.tabs.select(this.tabs.previousTab()); + } + + appNavPop() { + this.app.navPop(); + } +} diff --git a/src/components/nav/test/basic/pages/tabs/tabs.module.ts b/src/components/nav/test/basic/pages/tabs/tabs.module.ts new file mode 100644 index 0000000000..2efc02aa79 --- /dev/null +++ b/src/components/nav/test/basic/pages/tabs/tabs.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; +import { TabsPage } from './tabs'; + + +@NgModule({ + imports: [ + DeepLinkModule.forChild(TabsPage) + ], + declarations: [ + TabsPage + ], + entryComponents: [ + TabsPage, + ] +}) +export class TabsPageModule { } diff --git a/src/components/nav/test/basic/pages/tabs/tabs.ts b/src/components/nav/test/basic/pages/tabs/tabs.ts new file mode 100644 index 0000000000..9a2cf53aeb --- /dev/null +++ b/src/components/nav/test/basic/pages/tabs/tabs.ts @@ -0,0 +1,42 @@ +import { Component } from '@angular/core'; +import { Tab } from '../../../../../..'; + +@Component({ + template: ` + + + + Menu + + + + + + + + + + + + + + + + + ` +}) +export class TabsPage { + root1 = 'tab-one'; + root2 = 'tab-two'; + root3 = 'tab-three'; + + onChange(ev: Tab) { + console.log('Changed tab', ev); + } + + onSelect(ev: Tab) { + console.log('Selected tab', ev); + } +} diff --git a/src/components/nav/test/child-navs/app.module.ts b/src/components/nav/test/child-navs/app.module.ts index a56860609c..0ed34ddeda 100644 --- a/src/components/nav/test/child-navs/app.module.ts +++ b/src/components/nav/test/child-navs/app.module.ts @@ -1,5 +1,6 @@ import { NgModule, Component } from '@angular/core'; -import { IonicApp, IonicModule, NavController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavController } from '../../../..'; @Component({ template: ``, @@ -127,6 +128,7 @@ export class FourthPage { FourthPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/nav/test/child-navs/e2e.ts b/src/components/nav/test/child-navs/e2e.ts index e5101c4804..df275c0f50 100644 --- a/src/components/nav/test/child-navs/e2e.ts +++ b/src/components/nav/test/child-navs/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should go to nested children', function() { element(by.css('.e2eChildNavsNested')).click(); diff --git a/src/components/nav/test/child-navs/main.ts b/src/components/nav/test/child-navs/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/nav/test/child-navs/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/nav/test/init-async/app.module.ts b/src/components/nav/test/init-async/app.module.ts index 30c4922d00..560e817894 100644 --- a/src/components/nav/test/init-async/app.module.ts +++ b/src/components/nav/test/init-async/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -32,6 +33,7 @@ export class E2EApp { AsyncPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/nav/test/init-async/main.ts b/src/components/nav/test/init-async/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/nav/test/init-async/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/nav/test/insert-views/app.module.ts b/src/components/nav/test/insert-views/app.module.ts index fbed04857e..8bae0bd304 100644 --- a/src/components/nav/test/insert-views/app.module.ts +++ b/src/components/nav/test/insert-views/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, NavController, NavParams } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavController, NavParams } from '../../../..'; @Component({ @@ -112,6 +113,7 @@ export class E2EApp { InsertPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/nav/test/insert-views/main.ts b/src/components/nav/test/insert-views/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/nav/test/insert-views/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/nav/test/memory/app.module.ts b/src/components/nav/test/memory/app.module.ts index 4ca9cd38a6..5e749f6f6c 100644 --- a/src/components/nav/test/memory/app.module.ts +++ b/src/components/nav/test/memory/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, NavController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavController } from '../../../..'; let delay = 100; @@ -88,6 +89,7 @@ export class E2EApp { Page2 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/nav/test/memory/main.ts b/src/components/nav/test/memory/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/nav/test/memory/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/nav/test/nav-push-pop/app.module.ts b/src/components/nav/test/nav-push-pop/app.module.ts index 13c56c3c98..8bcbea5e99 100644 --- a/src/components/nav/test/nav-push-pop/app.module.ts +++ b/src/components/nav/test/nav-push-pop/app.module.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; - -import { IonicApp, IonicModule, NavParams } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavParams } from '../../../..'; @@ -52,6 +52,7 @@ export class E2EApp { SecondPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/nav/test/nav-push-pop/main.ts b/src/components/nav/test/nav-push-pop/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/nav/test/nav-push-pop/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/nav/test/worst-case/app.module.ts b/src/components/nav/test/worst-case/app.module.ts index dba429112b..865ae49195 100644 --- a/src/components/nav/test/worst-case/app.module.ts +++ b/src/components/nav/test/worst-case/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, NavController, NavParams } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavController, NavParams } from '../../../..'; import { DomSanitizer } from '@angular/platform-browser'; @@ -304,6 +305,7 @@ export class E2EApp { Results ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/nav/test/worst-case/main.ts b/src/components/nav/test/worst-case/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/nav/test/worst-case/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/picker/test/basic/app.module.ts b/src/components/picker/test/basic/app.module.ts index bef8b32fbd..ccfc9adb02 100644 --- a/src/components/picker/test/basic/app.module.ts +++ b/src/components/picker/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewEncapsulation, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, NavController, PickerController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavController, PickerController } from '../../../..'; @Component({ @@ -230,6 +231,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/picker/test/basic/main.ts b/src/components/picker/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/picker/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/popover/test/basic/app.module.ts b/src/components/popover/test/basic/app.module.ts index b0a99271fb..c4fe55980e 100644 --- a/src/components/popover/test/basic/app.module.ts +++ b/src/components/popover/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, ElementRef, ViewEncapsulation, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, PopoverController, NavParams, ViewController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, PopoverController, NavParams, ViewController } from '../../../..'; @Component({ @@ -241,6 +242,7 @@ export class E2EApp { PopoverLongListPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/popover/test/basic/e2e.ts b/src/components/popover/test/basic/e2e.ts index 04dcbd7a7c..d659c7a067 100644 --- a/src/components/popover/test/basic/e2e.ts +++ b/src/components/popover/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open list popover', function() { element(by.css('.e2eOpenListPopover')).click(); diff --git a/src/components/popover/test/basic/main.ts b/src/components/popover/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/popover/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/radio/test/basic/app.module.ts b/src/components/radio/test/basic/app.module.ts index 0cf6043719..f732c39b30 100644 --- a/src/components/radio/test/basic/app.module.ts +++ b/src/components/radio/test/basic/app.module.ts @@ -1,6 +1,7 @@ import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { FormControl, FormGroup } from '@angular/forms'; -import { IonicApp, IonicModule, RadioButton, RadioGroup } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule, RadioButton, RadioGroup } from '../../../..'; @Component({ @@ -87,6 +88,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/radio/test/basic/e2e.ts b/src/components/radio/test/basic/e2e.ts index 824806e17a..c4d965d911 100644 --- a/src/components/radio/test/basic/e2e.ts +++ b/src/components/radio/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should check Cherry', function() { element(by.css('[value="cherry"] button')).click(); diff --git a/src/components/radio/test/basic/main.ts b/src/components/radio/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/radio/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/range/test/basic/app.module.ts b/src/components/range/test/basic/app.module.ts index d73522ddbf..c15392d8f1 100644 --- a/src/components/range/test/basic/app.module.ts +++ b/src/components/range/test/basic/app.module.ts @@ -1,6 +1,7 @@ import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { FormControl, FormGroup } from '@angular/forms'; -import { IonicApp, IonicModule, Range } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule, Range } from '../../../..'; @Component({ @@ -41,6 +42,7 @@ export class E2EApp { Page1 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/range/test/basic/main.ts b/src/components/range/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/range/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/refresher/test/basic/app.module.ts b/src/components/refresher/test/basic/app.module.ts index d124e974bf..babc2ee3e1 100644 --- a/src/components/refresher/test/basic/app.module.ts +++ b/src/components/refresher/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Refresher } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Refresher } from '../../../..'; @Component({ @@ -99,6 +100,7 @@ export class E2EApp { Page1 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/refresher/test/basic/main.ts b/src/components/refresher/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/refresher/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/refresher/test/navigation/app.module.ts b/src/components/refresher/test/navigation/app.module.ts index 2ff93f5eb9..e24a25d42e 100644 --- a/src/components/refresher/test/navigation/app.module.ts +++ b/src/components/refresher/test/navigation/app.module.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Refresher, NavController } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule, Refresher, NavController } from '../../../..'; @Component({ diff --git a/src/components/refresher/test/navigation/main.ts b/src/components/refresher/test/navigation/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/refresher/test/navigation/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/scroll/test/basic/app.module.ts b/src/components/scroll/test/basic/app.module.ts index 81f0a64222..ecb66838cb 100644 --- a/src/components/scroll/test/basic/app.module.ts +++ b/src/components/scroll/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -16,6 +17,7 @@ export class E2EApp { E2EApp ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/scroll/test/basic/main.ts b/src/components/scroll/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/scroll/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/searchbar/test/basic/app.module.ts b/src/components/searchbar/test/basic/app.module.ts index fb5fe9c6c3..02d881ebb3 100644 --- a/src/components/searchbar/test/basic/app.module.ts +++ b/src/components/searchbar/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, ChangeDetectorRef, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -62,6 +63,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/searchbar/test/basic/main.ts b/src/components/searchbar/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/searchbar/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/searchbar/test/nav/app.module.ts b/src/components/searchbar/test/nav/app.module.ts index dacfa242fc..864e324909 100644 --- a/src/components/searchbar/test/nav/app.module.ts +++ b/src/components/searchbar/test/nav/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, ModalController, NavController, NavParams, ViewController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, ModalController, NavController, NavParams, ViewController } from '../../../..'; @Component({ @@ -141,6 +142,7 @@ export class E2EApp { TabsPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/searchbar/test/nav/e2e.ts b/src/components/searchbar/test/nav/e2e.ts index fed7b2cc88..3f040837be 100644 --- a/src/components/searchbar/test/nav/e2e.ts +++ b/src/components/searchbar/test/nav/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should navigate to details', function() { element(by.css('.e2eSearchbarNavItem:first-child')).click(); diff --git a/src/components/searchbar/test/nav/main.ts b/src/components/searchbar/test/nav/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/searchbar/test/nav/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/searchbar/test/toolbar/app.module.ts b/src/components/searchbar/test/toolbar/app.module.ts index 8fc7b6bdea..96dd57b269 100644 --- a/src/components/searchbar/test/toolbar/app.module.ts +++ b/src/components/searchbar/test/toolbar/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -25,6 +26,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/searchbar/test/toolbar/main.ts b/src/components/searchbar/test/toolbar/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/searchbar/test/toolbar/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/segment/test/basic/app.module.ts b/src/components/segment/test/basic/app.module.ts index 662728ff00..a9e45024bd 100644 --- a/src/components/segment/test/basic/app.module.ts +++ b/src/components/segment/test/basic/app.module.ts @@ -1,6 +1,7 @@ import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { FormBuilder, Validators } from '@angular/forms'; -import { IonicApp, IonicModule, SegmentButton } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule, SegmentButton } from '../../../..'; @Component({ @@ -51,6 +52,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/segment/test/basic/e2e.ts b/src/components/segment/test/basic/e2e.ts index 06d1d6bb26..7743c8e09a 100644 --- a/src/components/segment/test/basic/e2e.ts +++ b/src/components/segment/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('friends and standard should be selected', function() { element(by.css('.e2eSegmentFriends')).click(); diff --git a/src/components/segment/test/basic/main.ts b/src/components/segment/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/segment/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/segment/test/nav/app.module.ts b/src/components/segment/test/nav/app.module.ts index 4ff045400b..f552a79d63 100644 --- a/src/components/segment/test/nav/app.module.ts +++ b/src/components/segment/test/nav/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, NavController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavController } from '../../../..'; @Component({ @@ -52,6 +53,7 @@ export class E2EApp { SegmentPage2 ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/segment/test/nav/e2e.ts b/src/components/segment/test/nav/e2e.ts index 4abd43f723..a90670bfeb 100644 --- a/src/components/segment/test/nav/e2e.ts +++ b/src/components/segment/test/nav/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('existing should be selected', function() { element(by.css('.e2eSegmentExistingSegment')).click(); diff --git a/src/components/segment/test/nav/main.ts b/src/components/segment/test/nav/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/segment/test/nav/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/segment/test/swipe/app.module.ts b/src/components/segment/test/swipe/app.module.ts index 1134a11b69..37d2d22edd 100644 --- a/src/components/segment/test/swipe/app.module.ts +++ b/src/components/segment/test/swipe/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Slides, SegmentButton } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Slides, SegmentButton } from '../../../..'; @Component({ @@ -59,6 +60,7 @@ export class E2EApp { SegmentPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/segment/test/swipe/main.ts b/src/components/segment/test/swipe/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/segment/test/swipe/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/select/test/multiple-value/app.module.ts b/src/components/select/test/multiple-value/app.module.ts index 19480094a7..d7f53c0ac3 100644 --- a/src/components/select/test/multiple-value/app.module.ts +++ b/src/components/select/test/multiple-value/app.module.ts @@ -1,6 +1,7 @@ import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { FormControl, FormGroup } from '@angular/forms'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -61,6 +62,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/select/test/multiple-value/e2e.ts b/src/components/select/test/multiple-value/e2e.ts index 731f977a74..57e817aded 100644 --- a/src/components/select/test/multiple-value/e2e.ts +++ b/src/components/select/test/multiple-value/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open toppings multiple select', function() { element(by.css('.e2eSelectToppings button')).click(); diff --git a/src/components/select/test/multiple-value/main.ts b/src/components/select/test/multiple-value/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/select/test/multiple-value/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/select/test/single-value/app.module.ts b/src/components/select/test/single-value/app.module.ts index 18999f8e85..62c7416ea6 100644 --- a/src/components/select/test/single-value/app.module.ts +++ b/src/components/select/test/single-value/app.module.ts @@ -1,6 +1,7 @@ import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { FormControl, FormGroup } from '@angular/forms'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule } from '../../../..'; export interface Currency { symbol: string; @@ -108,6 +109,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/select/test/single-value/e2e.ts b/src/components/select/test/single-value/e2e.ts index 0e536eabc7..69540d8daa 100644 --- a/src/components/select/test/single-value/e2e.ts +++ b/src/components/select/test/single-value/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open gender single select', function() { element(by.css('.e2eSelectGender button')).click(); diff --git a/src/components/select/test/single-value/main.ts b/src/components/select/test/single-value/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/select/test/single-value/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/show-hide-when/test/basic/app.module.ts b/src/components/show-hide-when/test/basic/app.module.ts index 04f9734f47..f6a64ced1c 100644 --- a/src/components/show-hide-when/test/basic/app.module.ts +++ b/src/components/show-hide-when/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -23,6 +24,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/show-hide-when/test/basic/main.ts b/src/components/show-hide-when/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/show-hide-when/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/slides/test/basic/app.module.ts b/src/components/slides/test/basic/app.module.ts index 67b062a744..33651f39ca 100644 --- a/src/components/slides/test/basic/app.module.ts +++ b/src/components/slides/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Slides } from '../../../..'; @Component({ @@ -35,6 +36,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/slides/test/basic/main.ts b/src/components/slides/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/slides/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/slides/test/control/app.module.ts b/src/components/slides/test/control/app.module.ts index a3c398c33a..9155cae756 100644 --- a/src/components/slides/test/control/app.module.ts +++ b/src/components/slides/test/control/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Slides } from '../../../..'; @Component({ @@ -24,6 +25,7 @@ export class E2EApp { MyPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/slides/test/control/main.ts b/src/components/slides/test/control/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/slides/test/control/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/slides/test/controller/app.module.ts b/src/components/slides/test/controller/app.module.ts index 96325fa591..a41a8756a5 100644 --- a/src/components/slides/test/controller/app.module.ts +++ b/src/components/slides/test/controller/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Slides } from '../../../..'; @Component({ @@ -55,6 +56,7 @@ export class E2EApp { MyPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/slides/test/controller/main.ts b/src/components/slides/test/controller/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/slides/test/controller/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/slides/test/images/app.module.ts b/src/components/slides/test/images/app.module.ts index 91acb72890..932c750614 100644 --- a/src/components/slides/test/images/app.module.ts +++ b/src/components/slides/test/images/app.module.ts @@ -1,6 +1,8 @@ import { Component, ViewChild, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { Http } from '@angular/http'; -import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular'; + +import { IonicApp, IonicModule, Slides } from '../../../..'; @Component({ @@ -16,7 +18,7 @@ export class E2EPage { let tags = 'madison wisconsin'; let FLICKR_API_KEY = '504fd7414f6275eb5b657ddbfba80a2c'; - let baseUrl = 'https://api.flickr.com/services/rest/'; + let baseUrl = 'https://api.flickr.com/services/rest'; this.http.get(baseUrl + '?method=flickr.groups.pools.getPhotos&group_id=1463451@N25&safe_search=1&api_key=' + FLICKR_API_KEY + '&nojsoncallback=1&format=json&tags=' + tags) @@ -51,6 +53,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/slides/test/images/main.ts b/src/components/slides/test/images/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/slides/test/images/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/slides/test/intro/app.module.ts b/src/components/slides/test/intro/app.module.ts index ab68205706..91cd0b4839 100644 --- a/src/components/slides/test/intro/app.module.ts +++ b/src/components/slides/test/intro/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule, ViewChild } from '@angular/core'; -import { IonicApp, IonicModule, NavController, Slides } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavController, Slides } from '../../../..'; @Component({ @@ -71,6 +72,7 @@ export class E2EApp { MainPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/slides/test/intro/main.ts b/src/components/slides/test/intro/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/slides/test/intro/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/slides/test/loop/app.module.ts b/src/components/slides/test/loop/app.module.ts index 01f93fb671..c3b7c0e23a 100644 --- a/src/components/slides/test/loop/app.module.ts +++ b/src/components/slides/test/loop/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Slides } from '../../../..'; @Component({ @@ -57,6 +58,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/slides/test/loop/main.ts b/src/components/slides/test/loop/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/slides/test/loop/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/slides/test/options/app.module.ts b/src/components/slides/test/options/app.module.ts index 3d2c8ff837..4ec2d2edd8 100644 --- a/src/components/slides/test/options/app.module.ts +++ b/src/components/slides/test/options/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Slides } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Slides } from '../../../..'; @Component({ @@ -40,6 +41,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/slides/test/options/main.ts b/src/components/slides/test/options/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/slides/test/options/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/slides/test/scroll/app.module.ts b/src/components/slides/test/scroll/app.module.ts index b9c379990b..da7409420d 100644 --- a/src/components/slides/test/scroll/app.module.ts +++ b/src/components/slides/test/scroll/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -20,6 +21,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/slides/test/scroll/main.ts b/src/components/slides/test/scroll/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/slides/test/scroll/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/spinner/test/basic/app.module.ts b/src/components/spinner/test/basic/app.module.ts index af75c2d6c0..93d74f80a5 100644 --- a/src/components/spinner/test/basic/app.module.ts +++ b/src/components/spinner/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -27,6 +28,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/spinner/test/basic/main.ts b/src/components/spinner/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/spinner/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/spinner/test/colors/app.module.ts b/src/components/spinner/test/colors/app.module.ts index af75c2d6c0..93d74f80a5 100644 --- a/src/components/spinner/test/colors/app.module.ts +++ b/src/components/spinner/test/colors/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -27,6 +28,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/spinner/test/colors/main.ts b/src/components/spinner/test/colors/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/spinner/test/colors/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/tabs/test/advanced/app.module.ts b/src/components/tabs/test/advanced/app.module.ts index 5168eb678f..a0da222e58 100644 --- a/src/components/tabs/test/advanced/app.module.ts +++ b/src/components/tabs/test/advanced/app.module.ts @@ -1,8 +1,9 @@ import { Component, NgModule, ViewChild } from '@angular/core'; -import { AlertController, DeepLinkConfig, IonicApp, IonicModule, App, NavController, NavParams, ModalController, ViewController, Tabs, Tab } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { AlertController, DeepLink, IonicApp, IonicModule, App, NavController, NavParams, ModalController, ViewController, Tabs, Tab } from '../../../..'; -// @DeepLink({ name: 'sign-in' }) +@DeepLink({ name: 'sign-in' }) @Component({ templateUrl: './signIn.html' }) @@ -379,21 +380,6 @@ export class E2EApp { rootPage = SignIn; } - -export const deepLinkConfig: DeepLinkConfig = { - links: [ - { component: SignIn, name: 'sign-in' }, - { component: TabsPage, name: 'tabs' }, - { component: Tab1Page1, name: 'tab1-page1' }, - { component: Tab1Page2, name: 'tab1-page2' }, - { component: Tab1Page3, name: 'tab1-page3' }, - { component: Tab2Page1, name: 'tab2-page1' }, - { component: Tab2Page2, name: 'tab2-page2' }, - { component: Tab2Page3, name: 'tab2-page3' }, - { component: Tab3Page1, name: 'tab3-page1' }, - ] -}; - @NgModule({ declarations: [ E2EApp, @@ -409,7 +395,20 @@ export const deepLinkConfig: DeepLinkConfig = { Tab3Page1 ], imports: [ - IonicModule.forRoot(E2EApp, {tabsHideOnSubPages: true}, deepLinkConfig) + BrowserModule, + IonicModule.forRoot(E2EApp, {tabsHideOnSubPages: true}, { + links: [ + { component: SignIn, name: 'sign-in' }, + { component: TabsPage, name: 'tabs' }, + { component: Tab1Page1, name: 'tab1-page1' }, + { component: Tab1Page2, name: 'tab1-page2' }, + { component: Tab1Page3, name: 'tab1-page3' }, + { component: Tab2Page1, name: 'tab2-page1' }, + { component: Tab2Page2, name: 'tab2-page2' }, + { component: Tab2Page3, name: 'tab2-page3' }, + { component: Tab3Page1, name: 'tab3-page1' }, + ] + }) ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/components/tabs/test/advanced/e2e.ts b/src/components/tabs/test/advanced/e2e.ts index 44079fa3e1..c6b820fc1d 100644 --- a/src/components/tabs/test/advanced/e2e.ts +++ b/src/components/tabs/test/advanced/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should go to Tab1 Page1', function() { element(by.css('.e2eSignIn')).click(); diff --git a/src/components/tabs/test/advanced/main.ts b/src/components/tabs/test/advanced/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/tabs/test/advanced/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/tabs/test/badges/app.module.ts b/src/components/tabs/test/badges/app.module.ts index 0e37a54db5..f537d83ecd 100644 --- a/src/components/tabs/test/badges/app.module.ts +++ b/src/components/tabs/test/badges/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewEncapsulation, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({template: 'hi'}) export class E2EPage {} @@ -38,6 +39,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/tabs/test/badges/main.ts b/src/components/tabs/test/badges/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/tabs/test/badges/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/tabs/test/basic/app.module.ts b/src/components/tabs/test/basic/app.module.ts index e0761ec2b3..9ec336383d 100644 --- a/src/components/tabs/test/basic/app.module.ts +++ b/src/components/tabs/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { Config, IonicApp, IonicModule, App, AlertController, ModalController, ViewController, Tab, Tabs } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { Config, IonicApp, IonicModule, App, AlertController, ModalController, ViewController, Tab, Tabs } from '../../../..'; // // Modal @@ -291,6 +292,7 @@ export class E2EApp { TabsPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp, { tabsHighlight: true, }) diff --git a/src/components/tabs/test/basic/main.ts b/src/components/tabs/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/tabs/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/tabs/test/colors/app.module.ts b/src/components/tabs/test/colors/app.module.ts index 4334b85916..8295138093 100644 --- a/src/components/tabs/test/colors/app.module.ts +++ b/src/components/tabs/test/colors/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewEncapsulation, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({template: 'hi'}) @@ -39,6 +40,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/tabs/test/colors/main.ts b/src/components/tabs/test/colors/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/tabs/test/colors/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/tabs/test/events/app.module.ts b/src/components/tabs/test/events/app.module.ts index a01dcedd30..779af7af3f 100644 --- a/src/components/tabs/test/events/app.module.ts +++ b/src/components/tabs/test/events/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Events } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Events } from '../../../..'; // // Tab 1 @@ -87,6 +88,7 @@ export class E2EApp { TabsPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp, { tabsHighlight: true, }) diff --git a/src/components/tabs/test/events/main.ts b/src/components/tabs/test/events/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/tabs/test/events/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/tabs/test/ghost/app.module.ts b/src/components/tabs/test/ghost/app.module.ts index 0da3c4cf5d..115009b845 100644 --- a/src/components/tabs/test/ghost/app.module.ts +++ b/src/components/tabs/test/ghost/app.module.ts @@ -1,5 +1,6 @@ import { Component, QueryList, ViewChildren, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Tab } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Tab } from '../../../..'; // @@ -113,7 +114,7 @@ export class TabsPage { } openPage(which: string) { - let pages = { + let pages: any = { 'quesarito': QuesaritoPage }; @@ -131,6 +132,7 @@ export class TabsPage { TabsPage ], imports: [ + BrowserModule, IonicModule.forRoot(TabsPage) ], bootstrap: [IonicApp], diff --git a/src/components/tabs/test/ghost/main.ts b/src/components/tabs/test/ghost/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/tabs/test/ghost/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/tabs/test/lifecyles/app.module.ts b/src/components/tabs/test/lifecyles/app.module.ts index 85518828d1..6f6759f0f3 100644 --- a/src/components/tabs/test/lifecyles/app.module.ts +++ b/src/components/tabs/test/lifecyles/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, NavController, AlertController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavController, AlertController } from '../../../..'; // // Tab 1 @@ -115,6 +116,7 @@ export class E2EApp { TabsPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp, { tabsHighlight: true, }) diff --git a/src/components/tabs/test/lifecyles/main.ts b/src/components/tabs/test/lifecyles/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/tabs/test/lifecyles/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/tabs/test/tab-bar-scenarios/app.module.ts b/src/components/tabs/test/tab-bar-scenarios/app.module.ts index 84ba0ee25b..cabffaf4b0 100644 --- a/src/components/tabs/test/tab-bar-scenarios/app.module.ts +++ b/src/components/tabs/test/tab-bar-scenarios/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewEncapsulation, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({template: 'hi'}) @@ -38,6 +39,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/tabs/test/tab-bar-scenarios/main.ts b/src/components/tabs/test/tab-bar-scenarios/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/tabs/test/tab-bar-scenarios/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/tabs/test/top/app.module.ts b/src/components/tabs/test/top/app.module.ts index 20291dd585..0f80182863 100644 --- a/src/components/tabs/test/top/app.module.ts +++ b/src/components/tabs/test/top/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; // // Tab 1 @@ -127,6 +128,7 @@ export class E2EApp { TabsPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp, { tabsPlacement: 'top' }) diff --git a/src/components/tabs/test/top/main.ts b/src/components/tabs/test/top/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/tabs/test/top/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/toast/test/basic/app.module.ts b/src/components/toast/test/basic/app.module.ts index 47ab701213..1b6d11a93b 100644 --- a/src/components/toast/test/basic/app.module.ts +++ b/src/components/toast/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Toast, ToastController, NavController } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Toast, ToastController, NavController } from '../../../..'; @Component({ @@ -108,6 +109,7 @@ export class E2EApp { AnotherPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/toast/test/basic/e2e.ts b/src/components/toast/test/basic/e2e.ts index 97772ae28f..757a74a34f 100644 --- a/src/components/toast/test/basic/e2e.ts +++ b/src/components/toast/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should open toast', function() { element(by.css('.e2eOpenToast')).click(); diff --git a/src/components/toast/test/basic/main.ts b/src/components/toast/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/toast/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/toast/test/toast.spec.ts b/src/components/toast/test/toast.spec.ts index 7642e727f2..672dfcc842 100644 --- a/src/components/toast/test/toast.spec.ts +++ b/src/components/toast/test/toast.spec.ts @@ -1,5 +1,5 @@ -import { mockApp } from '../../../util/mock-providers'; -import { ToastController } from '../../toast/toast'; +import { mockApp, mockConfig } from '../../../util/mock-providers'; +import { ToastController } from '../../toast/toast-controller'; describe('Toast', () => { @@ -56,7 +56,7 @@ describe('Toast', () => { let toastCtrl: ToastController; beforeEach(() => { - toastCtrl = new ToastController(mockApp()); + toastCtrl = new ToastController(mockApp(), mockConfig()); }); }); diff --git a/src/components/toggle/test/basic/app.module.ts b/src/components/toggle/test/basic/app.module.ts index 451ec29526..b19be4ffef 100644 --- a/src/components/toggle/test/basic/app.module.ts +++ b/src/components/toggle/test/basic/app.module.ts @@ -1,6 +1,7 @@ import { Component, NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; import { FormControl, FormGroup } from '@angular/forms'; -import { IonicApp, IonicModule, Toggle } from '../../../../../ionic-angular'; +import { IonicApp, IonicModule, Toggle } from '../../../..'; @Component({ @@ -76,6 +77,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/toggle/test/basic/e2e.ts b/src/components/toggle/test/basic/e2e.ts index 498bf38618..fe47502bae 100644 --- a/src/components/toggle/test/basic/e2e.ts +++ b/src/components/toggle/test/basic/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should check apple via switch element click', function() { element(by.css('[formControlName="apple"]')).click(); diff --git a/src/components/toggle/test/basic/main.ts b/src/components/toggle/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/toggle/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/toolbar/test/basic/app.module.ts b/src/components/toolbar/test/basic/app.module.ts index 44e2181a9c..b454b94710 100644 --- a/src/components/toolbar/test/basic/app.module.ts +++ b/src/components/toolbar/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -23,6 +24,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/toolbar/test/basic/main.ts b/src/components/toolbar/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/toolbar/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/toolbar/test/colors/app.module.ts b/src/components/toolbar/test/colors/app.module.ts index cf65eab3db..e2e5f18343 100644 --- a/src/components/toolbar/test/colors/app.module.ts +++ b/src/components/toolbar/test/colors/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -18,6 +19,7 @@ export class E2EApp { E2EApp ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/toolbar/test/colors/main.ts b/src/components/toolbar/test/colors/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/toolbar/test/colors/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/toolbar/test/scenarios/app.module.ts b/src/components/toolbar/test/scenarios/app.module.ts index f1156c2181..e2e5f18343 100644 --- a/src/components/toolbar/test/scenarios/app.module.ts +++ b/src/components/toolbar/test/scenarios/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -7,7 +8,7 @@ import { IonicApp, IonicModule } from '../../../../../ionic-angular'; }) export class E2EApp { - buttonClick(button) { + buttonClick(button: any) { console.log(button); } @@ -18,6 +19,7 @@ export class E2EApp { E2EApp ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/toolbar/test/scenarios/main.ts b/src/components/toolbar/test/scenarios/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/toolbar/test/scenarios/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/typography/test/basic/app.module.ts b/src/components/typography/test/basic/app.module.ts index ffeb09dff1..288c0cfe85 100644 --- a/src/components/typography/test/basic/app.module.ts +++ b/src/components/typography/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -22,6 +23,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/typography/test/basic/main.ts b/src/components/typography/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/typography/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/virtual-scroll/test/basic/app.module.ts b/src/components/virtual-scroll/test/basic/app.module.ts index daebae3783..bc3b9e66fe 100644 --- a/src/components/virtual-scroll/test/basic/app.module.ts +++ b/src/components/virtual-scroll/test/basic/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, NavController, Platform } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, NavController, Platform } from '../../../..'; @Component({ @@ -23,7 +24,7 @@ export class E2EPage { if (plt.testUserAgent('Safari')) { this.webview = ': iOS Safari'; - } else if (!!window['webkit']) { + } else if (!!(window as any)['webkit']) { this.webview = ': iOS WKWebView'; } else { @@ -64,6 +65,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/virtual-scroll/test/basic/main.ts b/src/components/virtual-scroll/test/basic/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/virtual-scroll/test/basic/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/virtual-scroll/test/cards/app.module.ts b/src/components/virtual-scroll/test/cards/app.module.ts index 52cc70d059..d83277e4fd 100644 --- a/src/components/virtual-scroll/test/cards/app.module.ts +++ b/src/components/virtual-scroll/test/cards/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewEncapsulation, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -41,6 +42,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/virtual-scroll/test/cards/main.ts b/src/components/virtual-scroll/test/cards/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/virtual-scroll/test/cards/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/virtual-scroll/test/image-gallery/app.module.ts b/src/components/virtual-scroll/test/image-gallery/app.module.ts index 8cf9cc2d9a..330a7d7926 100644 --- a/src/components/virtual-scroll/test/image-gallery/app.module.ts +++ b/src/components/virtual-scroll/test/image-gallery/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewEncapsulation, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -8,7 +9,7 @@ import { IonicApp, IonicModule } from '../../../../../ionic-angular'; }) export class E2EPage { lastMonth: number; - items = []; + items: any[] = []; constructor() { var utcSeconds = 787523438; // Dec 15, 1994 @@ -87,6 +88,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/virtual-scroll/test/image-gallery/main.ts b/src/components/virtual-scroll/test/image-gallery/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/virtual-scroll/test/image-gallery/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/virtual-scroll/test/list/app.module.ts b/src/components/virtual-scroll/test/list/app.module.ts index badafa479d..541ecaabfb 100644 --- a/src/components/virtual-scroll/test/list/app.module.ts +++ b/src/components/virtual-scroll/test/list/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -116,6 +117,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/virtual-scroll/test/list/main.ts b/src/components/virtual-scroll/test/list/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/virtual-scroll/test/list/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/virtual-scroll/test/media/app.module.ts b/src/components/virtual-scroll/test/media/app.module.ts index f67b81b228..4ad07a2163 100644 --- a/src/components/virtual-scroll/test/media/app.module.ts +++ b/src/components/virtual-scroll/test/media/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Platform } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Platform } from '../../../..'; @Component({ @@ -28,7 +29,7 @@ export class E2EPage { if (plt.testUserAgent('Safari')) { this.webview = ': iOS Safari'; - } else if (!!window['webkit']) { + } else if (!!(window as any)['webkit']) { this.webview = ': iOS WKWebView'; } else { @@ -70,6 +71,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/virtual-scroll/test/media/e2e.ts b/src/components/virtual-scroll/test/media/e2e.ts index 4ac1adbfc7..70827cb511 100644 --- a/src/components/virtual-scroll/test/media/e2e.ts +++ b/src/components/virtual-scroll/test/media/e2e.ts @@ -1,3 +1,4 @@ +import { by, element } from 'protractor'; it('should check the first checkbox, toggle, and radio', function() { element(by.css('.item-0 .checkbox')).click(); diff --git a/src/components/virtual-scroll/test/media/main.ts b/src/components/virtual-scroll/test/media/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/virtual-scroll/test/media/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/virtual-scroll/test/sliding-item/app.module.ts b/src/components/virtual-scroll/test/sliding-item/app.module.ts index 04283453d4..2582030146 100644 --- a/src/components/virtual-scroll/test/sliding-item/app.module.ts +++ b/src/components/virtual-scroll/test/sliding-item/app.module.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, ElementRef, NgModule } from '@angular/core'; -import { IonicApp, IonicModule, Platform } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule, Platform } from '../../../..'; @Component({ @@ -60,6 +61,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/virtual-scroll/test/sliding-item/main.ts b/src/components/virtual-scroll/test/sliding-item/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/virtual-scroll/test/sliding-item/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/components/virtual-scroll/test/variable-size/app.module.ts b/src/components/virtual-scroll/test/variable-size/app.module.ts index e85d4cb5bd..690d74d9dc 100644 --- a/src/components/virtual-scroll/test/variable-size/app.module.ts +++ b/src/components/virtual-scroll/test/variable-size/app.module.ts @@ -1,5 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicApp, IonicModule } from '../../../../../ionic-angular'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../..'; @Component({ @@ -45,6 +46,7 @@ export class E2EApp { E2EPage ], imports: [ + BrowserModule, IonicModule.forRoot(E2EApp) ], bootstrap: [IonicApp], diff --git a/src/components/virtual-scroll/test/variable-size/main.ts b/src/components/virtual-scroll/test/variable-size/main.ts new file mode 100644 index 0000000000..6af7a5b2ae --- /dev/null +++ b/src/components/virtual-scroll/test/variable-size/main.ts @@ -0,0 +1,5 @@ +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app.module'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/src/navigation/test/deep-linker.spec.ts b/src/navigation/test/deep-linker.spec.ts index f7a0e3d071..f0f5cb94d9 100644 --- a/src/navigation/test/deep-linker.spec.ts +++ b/src/navigation/test/deep-linker.spec.ts @@ -1,7 +1,7 @@ import { DeepLinker, normalizeUrl } from '../deep-linker'; import { UrlSerializer } from '../url-serializer'; import { mockApp, mockDeepLinkConfig, mockNavController, mockLocation, - mockTab, mockTabs, mockViews, mockView, noop, + mockModuleLoader, mockTab, mockTabs, mockViews, mockView, noop, MockView1, MockView2, MockView3 } from '../../util/mock-providers'; @@ -10,27 +10,27 @@ describe('DeepLinker', () => { describe('updateLocation', () => { it('should update the browserUrl to / when the passed in url matches indexAliasUrl', () => { - linker.indexAliasUrl = '/my-special/url'; - linker.updateLocation('/my-special/url', 'forward'); - expect(linker.history[0]).toEqual('/'); + linker._indexAliasUrl = '/my-special/url'; + linker._updateLocation('/my-special/url', 'forward'); + expect(linker._history[0]).toEqual('/'); }); it('should update location.back when back direction and previous url is the same', () => { spyOn(linker._location, 'back'); spyOn(linker._location, 'go'); - spyOn(linker, 'historyPop'); - linker.history = ['first-page', 'some-page', 'current-page']; - linker.updateLocation('some-page', 'back'); + spyOn(linker, '_historyPop'); + linker._history = ['first-page', 'some-page', 'current-page']; + linker._updateLocation('some-page', 'back'); expect(linker._location.back).toHaveBeenCalled(); expect(linker._location.go).not.toHaveBeenCalled(); - expect(linker.historyPop).toHaveBeenCalled(); + expect(linker._historyPop).toHaveBeenCalled(); }); it('should not update location.go when same as current page', () => { spyOn(linker._location, 'back'); spyOn(linker._location, 'go'); - linker.history = ['current-page']; - linker.updateLocation('current-page', 'forward'); + linker._history = ['current-page']; + linker._updateLocation('current-page', 'forward'); expect(linker._location.back).not.toHaveBeenCalled(); expect(linker._location.go).not.toHaveBeenCalled(); }); @@ -38,22 +38,22 @@ describe('DeepLinker', () => { it('should update location.go when back direction but not actually the previous url', () => { spyOn(linker._location, 'back'); spyOn(linker._location, 'go'); - spyOn(linker, 'historyPush'); - linker.history = ['first-page', 'some-other-page']; - linker.updateLocation('some-page', 'forward'); + spyOn(linker, '_historyPush'); + linker._history = ['first-page', 'some-other-page']; + linker._updateLocation('some-page', 'forward'); expect(linker._location.back).not.toHaveBeenCalled(); expect(linker._location.go).toHaveBeenCalledWith('some-page'); - expect(linker.historyPush).toHaveBeenCalledWith('some-page'); + expect(linker._historyPush).toHaveBeenCalledWith('some-page'); }); it('should update location.go when forward direction', () => { spyOn(linker._location, 'back'); spyOn(linker._location, 'go'); - spyOn(linker, 'historyPush'); - linker.updateLocation('new-url', 'forward'); + spyOn(linker, '_historyPush'); + linker._updateLocation('new-url', 'forward'); expect(linker._location.back).not.toHaveBeenCalled(); expect(linker._location.go).toHaveBeenCalledWith('new-url'); - expect(linker.historyPush).toHaveBeenCalledWith('new-url'); + expect(linker._historyPush).toHaveBeenCalledWith('new-url'); }); }); @@ -67,12 +67,12 @@ describe('DeepLinker', () => { let view2 = mockView(MockView2); view2.id = 'MockPage2'; mockViews(nav, [view1, view2]); - linker.segments = serializer.parse('/MockPage2'); + linker._segments = serializer.parse('/MockPage2'); spyOn(nav, 'push'); spyOn(nav, 'popTo'); - linker.loadViewFromSegment(nav, noop); + linker._loadViewFromSegment(nav, noop); expect(nav.push).not.toHaveBeenCalled(); expect(nav.popTo).not.toHaveBeenCalled(); @@ -85,12 +85,12 @@ describe('DeepLinker', () => { let view2 = mockView(MockView2); view2.id = 'MockPage2'; mockViews(nav, [view1, view2]); - linker.segments = serializer.parse('/MockPage1'); + linker._segments = serializer.parse('/MockPage1'); spyOn(nav, 'push'); spyOn(nav, 'popTo'); - linker.loadViewFromSegment(nav, noop); + linker._loadViewFromSegment(nav, noop); expect(nav.push).not.toHaveBeenCalled(); expect(nav.popTo).toHaveBeenCalled(); @@ -98,12 +98,12 @@ describe('DeepLinker', () => { it('should push a new page', () => { let nav = mockNavController(); - linker.segments = serializer.parse('/MockPage1'); + linker._segments = serializer.parse('/MockPage1'); spyOn(nav, 'push'); spyOn(nav, 'popTo'); - linker.loadViewFromSegment(nav, noop); + linker._loadViewFromSegment(nav, noop); expect(nav.push).toHaveBeenCalled(); expect(nav.popTo).not.toHaveBeenCalled(); @@ -113,11 +113,11 @@ describe('DeepLinker', () => { let tabs = mockTabs(); mockTab(tabs); mockTab(tabs); - linker.segments = serializer.parse('/MockPage1'); + linker._segments = serializer.parse('/MockPage1'); spyOn(tabs, 'select'); - linker.loadViewFromSegment(tabs, noop); + linker._loadViewFromSegment(tabs, noop); expect(tabs.select).toHaveBeenCalled(); }); @@ -127,7 +127,7 @@ describe('DeepLinker', () => { let done = () => { calledDone = true; }; let nav = mockNavController(); - linker.loadViewFromSegment(nav, done); + linker._loadViewFromSegment(nav, done); expect(calledDone).toEqual(true); }); @@ -149,7 +149,7 @@ describe('DeepLinker', () => { mockTab(tabs); let tab3 = mockTab(tabs); - let path = linker.pathFromNavs(tab3, MockView3); + let path = linker._pathFromNavs(tab3, MockView3); expect(path.length).toEqual(3); expect(path[0].id).toEqual('viewtwo'); @@ -165,7 +165,7 @@ describe('DeepLinker', () => { let nav2 = mockNavController(); nav2.parent = nav1; - let path = linker.pathFromNavs(nav2, MockView3); + let path = linker._pathFromNavs(nav2, MockView3); expect(path.length).toEqual(2); expect(path[0].id).toEqual('viewone'); @@ -177,7 +177,7 @@ describe('DeepLinker', () => { it('should get the path for view and nav', () => { let nav = mockNavController(); let view = MockView1; - let path = linker.pathFromNavs(nav, view, null); + let path = linker._pathFromNavs(nav, view, null); expect(path.length).toEqual(1); expect(path[0].id).toEqual('viewone'); expect(path[0].name).toEqual('viewone'); @@ -186,7 +186,7 @@ describe('DeepLinker', () => { }); it('should do nothing if blank nav', () => { - let path = linker.pathFromNavs(null, null, null); + let path = linker._pathFromNavs(null, null, null); expect(path.length).toEqual(0); }); @@ -199,20 +199,20 @@ describe('DeepLinker', () => { let tab1 = mockTab(tabs); tab1.tabUrlPath = 'some-tab-url-path'; tab1.tabTitle = 'My Tab Title'; - expect(linker.getTabSelector(tab1)).toEqual('some-tab-url-path'); + expect(linker._getTabSelector(tab1)).toEqual('some-tab-url-path'); }); it('should get tab title selector', () => { let tabs = mockTabs(); let tab1 = mockTab(tabs); tab1.tabTitle = 'My Tab Title'; - expect(linker.getTabSelector(tab1)).toEqual('my-tab-title'); + expect(linker._getTabSelector(tab1)).toEqual('my-tab-title'); }); it('should get tab-0 selector', () => { let tabs = mockTabs(); let tab1 = mockTab(tabs); - expect(linker.getTabSelector(tab1)).toEqual('tab-0'); + expect(linker._getTabSelector(tab1)).toEqual('tab-0'); }); }); @@ -297,7 +297,7 @@ describe('DeepLinker', () => { tab2.id = 'tab2'; tab2.parent = tabs; - linker.segments = serializer.parse('/viewone/account/viewtwo'); + linker._segments = serializer.parse('/viewone/account/viewtwo'); let navSegment = linker.initNav(nav1); expect(navSegment.navId).toEqual('nav1'); @@ -323,7 +323,7 @@ describe('DeepLinker', () => { nav3.parent = nav2; nav3.id = 'nav3'; - linker.segments = serializer.parse('/viewone/viewtwo/viewthree'); + linker._segments = serializer.parse('/viewone/viewtwo/viewthree'); let p1 = linker.initNav(nav1); expect(p1.navId).toEqual('nav1'); @@ -341,20 +341,20 @@ describe('DeepLinker', () => { it('should load root nav', () => { let nav = mockNavController(); nav.id = 'myNavId'; - linker.segments = serializer.parse('MockPage1'); + linker._segments = serializer.parse('MockPage1'); let p = linker.initNav(nav); expect(p.navId).toEqual('myNavId'); expect(p.id).toEqual('MockPage1'); }); it('should return null when no nav', () => { - linker.segments = serializer.parse('MockPage1'); + linker._segments = serializer.parse('MockPage1'); expect(linker.initNav(null)).toEqual(null); }); it('should return null when segments in path', () => { let nav = mockNavController(); - linker.segments = []; + linker._segments = []; expect(linker.initNav(nav)).toEqual(null); }); @@ -362,11 +362,6 @@ describe('DeepLinker', () => { describe('createSegmentFromName', () => { - it('should match by the component class name as a string', () => { - let segment = serializer.createSegmentFromName('MockView1'); - expect(segment.component).toEqual(MockView1); - }); - it('should match by the links string name', () => { let segment = serializer.createSegmentFromName('viewone'); expect(segment.component).toEqual(MockView1); @@ -382,62 +377,62 @@ describe('DeepLinker', () => { describe('urlChange', () => { it('should use indexAliasUrl when set and browserUrl is /', () => { - linker.loadNavFromPath = (nav: any): any => {}; + linker._loadNavFromPath = (nav: any): any => {}; linker._app.getRootNav = () => { return mockNavController(); }; spyOn(serializer, 'parse'); - linker.indexAliasUrl = '/tabs-page/recents/tab1-page1'; - linker.urlChange('/'); + linker._indexAliasUrl = '/tabs-page/recents/tab1-page1'; + linker._urlChange('/'); expect(serializer.parse).toHaveBeenCalledWith('/tabs-page/recents/tab1-page1'); }); it('should use indexAliasUrl when set and browserUrl is /', () => { - linker.loadNavFromPath = (nav: any): any => {}; + linker._loadNavFromPath = (nav: any): any => {}; linker._app.getRootNav = () => { return mockNavController(); }; spyOn(serializer, 'parse'); - linker.indexAliasUrl = '/tabs-page/recents/tab1-page1'; - linker.urlChange('/'); + linker._indexAliasUrl = '/tabs-page/recents/tab1-page1'; + linker._urlChange('/'); expect(serializer.parse).toHaveBeenCalledWith('/tabs-page/recents/tab1-page1'); }); it('should historyPush if new url', () => { - spyOn(linker, 'historyPop'); - spyOn(linker, 'historyPush'); + spyOn(linker, '_historyPop'); + spyOn(linker, '_historyPush'); - linker.history = ['back-url', 'current-url']; - linker.urlChange('new-url'); + linker._history = ['back-url', 'current-url']; + linker._urlChange('new-url'); - expect(linker.historyPop).not.toHaveBeenCalled(); - expect(linker.historyPush).toHaveBeenCalled(); + expect(linker._historyPop).not.toHaveBeenCalled(); + expect(linker._historyPush).toHaveBeenCalled(); }); it('should historyPop if back url', () => { - spyOn(linker, 'historyPop'); - spyOn(linker, 'historyPush'); + spyOn(linker, '_historyPop'); + spyOn(linker, '_historyPush'); - linker.history = ['back-url', 'current-url']; - linker.urlChange('back-url'); + linker._history = ['back-url', 'current-url']; + linker._urlChange('back-url'); - expect(linker.historyPop).toHaveBeenCalled(); - expect(linker.historyPush).not.toHaveBeenCalled(); + expect(linker._historyPop).toHaveBeenCalled(); + expect(linker._historyPush).not.toHaveBeenCalled(); }); it('should do nothing if the url is the same', () => { - spyOn(linker, 'historyPop'); - spyOn(linker, 'historyPush'); + spyOn(linker, '_historyPop'); + spyOn(linker, '_historyPush'); - linker.history = ['current-url']; - linker.urlChange('current-url'); + linker._history = ['current-url']; + linker._urlChange('current-url'); - expect(linker.historyPop).not.toHaveBeenCalled(); - expect(linker.historyPush).not.toHaveBeenCalled(); + expect(linker._historyPop).not.toHaveBeenCalled(); + expect(linker._historyPush).not.toHaveBeenCalled(); }); }); @@ -445,17 +440,17 @@ describe('DeepLinker', () => { describe('isBackUrl', () => { it('should not be the back path when no history', () => { - expect(linker.isBackUrl('some-page')).toEqual(false); + expect(linker._isBackUrl('some-page')).toEqual(false); }); it('should not be the back when same as last path', () => { - linker.history = ['first-page', 'some-page']; - expect(linker.isBackUrl('some-page')).toEqual(false); + linker._history = ['first-page', 'some-page']; + expect(linker._isBackUrl('some-page')).toEqual(false); }); it('should be the back when same as second to last path', () => { - linker.history = ['first-page', 'some-page', 'current-page']; - expect(linker.isBackUrl('some-page')).toEqual(true); + linker._history = ['first-page', 'some-page', 'current-page']; + expect(linker._isBackUrl('some-page')).toEqual(true); }); }); @@ -463,17 +458,17 @@ describe('DeepLinker', () => { describe('isCurrentUrl', () => { it('should not be the current path when no history', () => { - expect(linker.isCurrentUrl('some-page')).toEqual(false); + expect(linker._isCurrentUrl('some-page')).toEqual(false); }); it('should be the current when same as last path', () => { - linker.history = ['first-page', 'some-page']; - expect(linker.isCurrentUrl('some-page')).toEqual(true); + linker._history = ['first-page', 'some-page']; + expect(linker._isCurrentUrl('some-page')).toEqual(true); }); it('should not be the current when not the last path', () => { - linker.history = ['first-page', 'some-page', 'current-page']; - expect(linker.isCurrentUrl('some-page')).toEqual(false); + linker._history = ['first-page', 'some-page', 'current-page']; + expect(linker._isCurrentUrl('some-page')).toEqual(false); }); }); @@ -510,8 +505,13 @@ describe('DeepLinker', () => { var serializer: UrlSerializer; beforeEach(() => { - serializer = new UrlSerializer(mockDeepLinkConfig()); - linker = new DeepLinker(mockApp(), serializer, mockLocation()); + let linkConfig = mockDeepLinkConfig(); + serializer = new UrlSerializer(linkConfig); + + let moduleLoader = mockModuleLoader(); + let baseCfr: any = null; + + linker = new DeepLinker(mockApp(), serializer, mockLocation(), moduleLoader as any, baseCfr); }); }); diff --git a/src/navigation/test/nav-controller.spec.ts b/src/navigation/test/nav-controller.spec.ts index 6870fd7715..8b33bcd136 100644 --- a/src/navigation/test/nav-controller.spec.ts +++ b/src/navigation/test/nav-controller.spec.ts @@ -9,7 +9,7 @@ describe('NavController', () => { describe('push and pop', () => { - it('should push multiple times and pop multiple times', () => { + it('should push multiple times and pop multiple times', (done: Function) => { let push1Done = jasmine.createSpy('PushDone'); let push2Done = jasmine.createSpy('PushDone'); let push3Done = jasmine.createSpy('PushDone'); @@ -18,114 +18,121 @@ describe('NavController', () => { let pop2Done = jasmine.createSpy('PopDone'); let pop3Done = jasmine.createSpy('PopDone'); - // Push 1 - nav.push(MockView1, null, { animate: false }, push1Done); let hasCompleted = true; let requiresTransition = true; - expect(push1Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView1', undefined, DIRECTION_FORWARD - ); - expect(nav.length()).toEqual(1); - expect(nav.getByIndex(0).component).toEqual(MockView1); - // Push 2 - nav.push(MockView2, null, { animate: false }, push2Done); - - expect(push2Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView2', 'MockView1', DIRECTION_FORWARD - ); - expect(nav.length()).toEqual(2); - expect(nav.getByIndex(0).component).toEqual(MockView1); - expect(nav.getByIndex(1).component).toEqual(MockView2); - - // Push 3 - nav.push(MockView3, null, { animate: false }, push3Done); - - expect(push3Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView3', 'MockView2', DIRECTION_FORWARD - ); - expect(nav.length()).toEqual(3); - expect(nav.getByIndex(0).component).toEqual(MockView1); - expect(nav.getByIndex(1).component).toEqual(MockView2); - expect(nav.getByIndex(2).component).toEqual(MockView3); - - // Push 4 - nav.push(MockView4, null, { animate: false }, push4Done); - - expect(push4Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView4', 'MockView3', DIRECTION_FORWARD - ); - expect(nav.length()).toEqual(4); - expect(nav.getByIndex(0).component).toEqual(MockView1); - expect(nav.getByIndex(1).component).toEqual(MockView2); - expect(nav.getByIndex(2).component).toEqual(MockView3); - expect(nav.getByIndex(3).component).toEqual(MockView4); - - // Pop 1 - nav.pop({ animate: false }, pop1Done); - - expect(pop1Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView3', 'MockView4', DIRECTION_BACK - ); - expect(nav.length()).toEqual(3); - expect(nav.getByIndex(0).component).toEqual(MockView1); - expect(nav.getByIndex(1).component).toEqual(MockView2); - expect(nav.getByIndex(2).component).toEqual(MockView3); - - // Pop 2 - nav.pop({ animate: false }, pop2Done); - - expect(pop2Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView2', 'MockView3', DIRECTION_BACK - ); - expect(nav.length()).toEqual(2); - expect(nav.getByIndex(0).component).toEqual(MockView1); - expect(nav.getByIndex(1).component).toEqual(MockView2); - - // Pop 3 - nav.pop({ animate: false }, pop3Done); - - expect(pop3Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView1', 'MockView2', DIRECTION_BACK - ); - expect(nav.length()).toEqual(1); - expect(nav.getByIndex(0).component).toEqual(MockView1); + // Push 1 + nav.push(MockView1, null, { animate: false }, push1Done).then(() => { + expect(push1Done).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView1', undefined, DIRECTION_FORWARD + ); + expect(nav.length()).toEqual(1); + expect(nav.getByIndex(0).component).toEqual(MockView1); + // Push 2 + return nav.push(MockView2, null, { animate: false }, push2Done); + }).then(() => { + expect(push2Done).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView2', 'MockView1', DIRECTION_FORWARD + ); + expect(nav.length()).toEqual(2); + expect(nav.getByIndex(0).component).toEqual(MockView1); + expect(nav.getByIndex(1).component).toEqual(MockView2); + // Push 3 + return nav.push(MockView3, null, { animate: false }, push3Done); + }).then(() => { + expect(push3Done).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView3', 'MockView2', DIRECTION_FORWARD + ); + expect(nav.length()).toEqual(3); + expect(nav.getByIndex(0).component).toEqual(MockView1); + expect(nav.getByIndex(1).component).toEqual(MockView2); + expect(nav.getByIndex(2).component).toEqual(MockView3); + // Push 4 + return nav.push(MockView4, null, { animate: false }, push4Done); + }).then(() => { + expect(push4Done).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView4', 'MockView3', DIRECTION_FORWARD + ); + expect(nav.length()).toEqual(4); + expect(nav.getByIndex(0).component).toEqual(MockView1); + expect(nav.getByIndex(1).component).toEqual(MockView2); + expect(nav.getByIndex(2).component).toEqual(MockView3); + expect(nav.getByIndex(3).component).toEqual(MockView4); + // Pop 1 + nav.pop({ animate: false }, pop1Done); + }).then(() => { + expect(pop1Done).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView3', 'MockView4', DIRECTION_BACK + ); + expect(nav.length()).toEqual(3); + expect(nav.getByIndex(0).component).toEqual(MockView1); + expect(nav.getByIndex(1).component).toEqual(MockView2); + expect(nav.getByIndex(2).component).toEqual(MockView3); + // Pop 2 + return nav.pop({ animate: false }, pop2Done); + }).then(() => { + expect(pop2Done).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView2', 'MockView3', DIRECTION_BACK + ); + expect(nav.length()).toEqual(2); + expect(nav.getByIndex(0).component).toEqual(MockView1); + expect(nav.getByIndex(1).component).toEqual(MockView2); + // Pop 3 + return nav.pop({ animate: false }, pop3Done); + }).then(() => { + expect(pop3Done).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView1', 'MockView2', DIRECTION_BACK + ); + expect(nav.length()).toEqual(1); + expect(nav.getByIndex(0).component).toEqual(MockView1); + done(); + }).catch((err: Error) => { + done(err); + }); }); - }); describe('push', () => { - it('should push a component as the first view', () => { - nav.push(MockView1, null, null, trnsDone); + it('should push a component as the first view', (done: Function) => { - let hasCompleted = true; - let requiresTransition = true; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView1', undefined, DIRECTION_FORWARD - ); - expect(nav.length()).toEqual(1); - expect(nav.getByIndex(0).component).toEqual(MockView1); - expect(nav.isTransitioning()).toEqual(false); + nav.push(MockView1, null, null, trnsDone).then(() => { + let hasCompleted = true; + let requiresTransition = true; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView1', undefined, DIRECTION_FORWARD + ); + expect(nav.length()).toEqual(1); + expect(nav.getByIndex(0).component).toEqual(MockView1); + expect(nav.isTransitioning()).toEqual(false); + done(); + }).catch((err: Error) => { + done(err); + }); }); - it('should push a component as the second view at the end', () => { + it('should push a component as the second view at the end', (done: Function) => { mockViews(nav, [mockView(MockView1)]); - nav.push(MockView2, null, null, trnsDone); - let hasCompleted = true; - let requiresTransition = true; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView2', 'MockView1', DIRECTION_FORWARD - ); - expect(nav.length()).toEqual(2); - expect(nav.getByIndex(0).component).toEqual(MockView1); - expect(nav.getByIndex(1).component).toEqual(MockView2); - expect(nav.isTransitioning()).toEqual(false); + nav.push(MockView2, null, null, trnsDone).then(() => { + let hasCompleted = true; + let requiresTransition = true; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView2', 'MockView1', DIRECTION_FORWARD + ); + expect(nav.length()).toEqual(2); + expect(nav.getByIndex(0).component).toEqual(MockView1); + expect(nav.getByIndex(1).component).toEqual(MockView2); + expect(nav.isTransitioning()).toEqual(false); + + done(); + }).catch((err: Error) => { + done(err); + }); }); - it('should push a ViewController as the second view and fire lifecycles', () => { + it('should push a ViewController as the second view and fire lifecycles', (done: Function) => { let view1 = mockView(); let view2 = mockView(); @@ -133,34 +140,38 @@ describe('NavController', () => { let instance2 = spyOnLifecycles(view2); mockViews(nav, [view1]); - nav.push(view2, null, null, trnsDone); - expect(instance1.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance1.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance1.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance1.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance1.ionViewCanLeave).toHaveBeenCalled(); - expect(instance1.ionViewWillLeave).toHaveBeenCalled(); - expect(instance1.ionViewDidLeave).toHaveBeenCalled(); - expect(instance1.ionViewWillUnload).not.toHaveBeenCalled(); + nav.push(view2, null, null, trnsDone).then(() => { + expect(instance1.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance1.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance1.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance1.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance1.ionViewCanLeave).toHaveBeenCalled(); + expect(instance1.ionViewWillLeave).toHaveBeenCalled(); + expect(instance1.ionViewDidLeave).toHaveBeenCalled(); + expect(instance1.ionViewWillUnload).not.toHaveBeenCalled(); - expect(instance2.ionViewDidLoad).toHaveBeenCalled(); - expect(instance2.ionViewCanEnter).toHaveBeenCalled(); - expect(instance2.ionViewWillEnter).toHaveBeenCalled(); - expect(instance2.ionViewDidEnter).toHaveBeenCalled(); - expect(instance2.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance2.ionViewWillLeave).not.toHaveBeenCalled(); - expect(instance2.ionViewDidLeave).not.toHaveBeenCalled(); - expect(instance2.ionViewWillUnload).not.toHaveBeenCalled(); + expect(instance2.ionViewDidLoad).toHaveBeenCalled(); + expect(instance2.ionViewCanEnter).toHaveBeenCalled(); + expect(instance2.ionViewWillEnter).toHaveBeenCalled(); + expect(instance2.ionViewDidEnter).toHaveBeenCalled(); + expect(instance2.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance2.ionViewWillLeave).not.toHaveBeenCalled(); + expect(instance2.ionViewDidLeave).not.toHaveBeenCalled(); + expect(instance2.ionViewWillUnload).not.toHaveBeenCalled(); - let hasCompleted = true; - let requiresTransition = true; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView', 'MockView', DIRECTION_FORWARD - ); - expect(nav.length()).toEqual(2); + let hasCompleted = true; + let requiresTransition = true; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView', 'MockView', DIRECTION_FORWARD + ); + expect(nav.length()).toEqual(2); + + done(); + }).catch((err: Error) => { + done(err); + }); }); - }); describe('insert', () => { @@ -174,73 +185,91 @@ describe('NavController', () => { }); - it('should insert at the begining with no async transition', () => { + it('should insert at the begining with no async transition', (done: Function) => { let view4 = mockView(MockView4); let instance4 = spyOnLifecycles(view4); let opts: NavOptions = {}; mockViews(nav, [mockView(MockView1), mockView(MockView2), mockView(MockView3)]); - nav.insert(0, view4, null, opts, trnsDone); - expect(instance4.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance4.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance4.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance4.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance4.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance4.ionViewWillLeave).not.toHaveBeenCalled(); - expect(instance4.ionViewDidLeave).not.toHaveBeenCalled(); - expect(instance4.ionViewWillUnload).not.toHaveBeenCalled(); + nav.insert(0, view4, null, opts, trnsDone).then(() => { + expect(instance4.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance4.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance4.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance4.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance4.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance4.ionViewWillLeave).not.toHaveBeenCalled(); + expect(instance4.ionViewDidLeave).not.toHaveBeenCalled(); + expect(instance4.ionViewWillUnload).not.toHaveBeenCalled(); - let hasCompleted = true; - let requiresTransition = false; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, undefined, undefined, undefined - ); - expect(nav.length()).toEqual(4); - expect(nav.first().component).toEqual(MockView4); - expect(nav.last().component).toEqual(MockView3); + let hasCompleted = true; + let requiresTransition = false; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, undefined, undefined, undefined + ); + expect(nav.length()).toEqual(4); + expect(nav.first().component).toEqual(MockView4); + expect(nav.last().component).toEqual(MockView3); + + done(); + }).catch((err: Error) => { + done(err); + }); }); - it('should insert at the end when given -1', () => { + it('should insert at the end when given -1', (done: Function) => { let opts: NavOptions = {}; mockViews(nav, [mockView(MockView1)]); - nav.insert(-1, MockView2, null, opts, trnsDone); - let hasCompleted = true; - let requiresTransition = true; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView2', 'MockView1', DIRECTION_FORWARD - ); - expect(nav.length()).toEqual(2); - expect(nav.last().component).toEqual(MockView2); + nav.insert(-1, MockView2, null, opts, trnsDone).then(() => { + let hasCompleted = true; + let requiresTransition = true; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView2', 'MockView1', DIRECTION_FORWARD + ); + expect(nav.length()).toEqual(2); + expect(nav.last().component).toEqual(MockView2); + done(); + }).catch((err: Error) => { + done(err); + }); }); - it('should insert at the end when given a number greater than actual length', () => { + it('should insert at the end when given a number greater than actual length', (done: Function) => { mockViews(nav, [mockView(MockView1)]); - nav.insert(9999, MockView2, null, null, trnsDone); - let hasCompleted = true; - let requiresTransition = true; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView2', 'MockView1', DIRECTION_FORWARD - ); - expect(nav.length()).toEqual(2); - expect(nav.last().component).toEqual(MockView2); + nav.insert(9999, MockView2, null, null, trnsDone).then(() => { + let hasCompleted = true; + let requiresTransition = true; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView2', 'MockView1', DIRECTION_FORWARD + ); + expect(nav.length()).toEqual(2); + expect(nav.last().component).toEqual(MockView2); + + done(); + }).catch((err: Error) => { + done(err); + }); }); - it('should not insert if null view', () => { + it('should not insert if null view', (done: Function) => { mockViews(nav, [mockView(MockView1)]); - nav.insert(-1, null, null, null, trnsDone); - let hasCompleted = false; - let requiresTransition = false; - let rejectReason = 'invalid views to insert'; - expect(trnsDone).toHaveBeenCalledWith(hasCompleted, requiresTransition, rejectReason); - expect(nav.length()).toEqual(1); - expect(nav.last().component).toEqual(MockView1); + nav.insert(-1, null, null, null, trnsDone).then(() => { + let hasCompleted = false; + let requiresTransition = false; + let rejectReason = 'invalid views to insert'; + expect(trnsDone).toHaveBeenCalledWith(hasCompleted, requiresTransition, rejectReason); + expect(nav.length()).toEqual(1); + expect(nav.last().component).toEqual(MockView1); + done(); + }).catch((err: Error) => { + done(err); + }); }); - it('should not insert any view in the stack if canLeave returns false', () => { + it('should not insert any view in the stack if canLeave returns false', (done: Function) => { let view1 = mockView(MockView1); let view2 = mockView(MockView2); let view3 = mockView(MockView3); @@ -254,14 +283,18 @@ describe('NavController', () => { return (count === 3); }; - nav.push(view3); - expect(nav.length()).toEqual(2); - - nav.push(view3); - expect(nav.length()).toEqual(2); - - nav.push(view3); - expect(nav.length()).toEqual(3); + nav.push(view3).then(() => { + expect(nav.length()).toEqual(2); + return nav.push(view3); + }).then(() => { + expect(nav.length()).toEqual(2); + return nav.push(view3); + }).then(() => { + expect(nav.length()).toEqual(3); + done(); + }).catch((err: Error) => { + done(err); + }); }); it('should not remove any view from the stack if canLeave returns false', () => { @@ -291,37 +324,41 @@ describe('NavController', () => { describe('insertPages', () => { - it('should insert all pages in the middle', () => { + it('should insert all pages in the middle', (done: Function) => { let view4 = mockView(MockView4); let instance4 = spyOnLifecycles(view4); mockViews(nav, [mockView(MockView1), mockView(MockView2), mockView(MockView3)]); - nav.insertPages(1, [view4, mockView(MockView5)], null, trnsDone); - expect(instance4.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance4.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance4.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance4.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance4.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance4.ionViewWillLeave).not.toHaveBeenCalled(); - expect(instance4.ionViewDidLeave).not.toHaveBeenCalled(); - expect(instance4.ionViewWillUnload).not.toHaveBeenCalled(); + nav.insertPages(1, [view4, mockView(MockView5)], null, trnsDone).then(() => { + expect(instance4.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance4.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance4.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance4.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance4.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance4.ionViewWillLeave).not.toHaveBeenCalled(); + expect(instance4.ionViewDidLeave).not.toHaveBeenCalled(); + expect(instance4.ionViewWillUnload).not.toHaveBeenCalled(); - let hasCompleted = true; - let requiresTransition = false; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, undefined, undefined, undefined - ); - expect(nav.length()).toEqual(5); - expect(nav.getByIndex(0).component).toEqual(MockView1); - expect(nav.getByIndex(1).component).toEqual(MockView4); - expect(nav.getByIndex(2).component).toEqual(MockView5); - expect(nav.getByIndex(3).component).toEqual(MockView2); - expect(nav.getByIndex(4).component).toEqual(MockView3); + let hasCompleted = true; + let requiresTransition = false; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, undefined, undefined, undefined + ); + expect(nav.length()).toEqual(5); + expect(nav.getByIndex(0).component).toEqual(MockView1); + expect(nav.getByIndex(1).component).toEqual(MockView4); + expect(nav.getByIndex(2).component).toEqual(MockView5); + expect(nav.getByIndex(3).component).toEqual(MockView2); + expect(nav.getByIndex(4).component).toEqual(MockView3); - expect(nav.getByIndex(1)._nav).toEqual(nav); - expect(nav.getByIndex(2)._nav).toEqual(nav); + expect(nav.getByIndex(1)._nav).toEqual(nav); + expect(nav.getByIndex(2)._nav).toEqual(nav); + + done(); + }).catch((err: Error) => { + done(err); + }); }); - }); describe('pop', () => { @@ -737,7 +774,7 @@ describe('NavController', () => { describe('setRoot', () => { - it('should set a ViewController as the root when its the last view, no transition', () => { + it('should set a ViewController as the root when its the last view, no transition', (done: Function) => { let view1 = mockView(MockView1); let view2 = mockView(MockView2); let view3 = mockView(MockView3); @@ -747,45 +784,48 @@ describe('NavController', () => { let instance2 = spyOnLifecycles(view2); let instance3 = spyOnLifecycles(view3); - nav.setRoot(view3, null, null, trnsDone); + nav.setRoot(view3, null, null, trnsDone).then(() => { + expect(instance1.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance1.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance1.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance1.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance1.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance1.ionViewWillLeave).toHaveBeenCalled(); + expect(instance1.ionViewDidLeave).toHaveBeenCalled(); + expect(instance1.ionViewWillUnload).toHaveBeenCalled(); - expect(instance1.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance1.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance1.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance1.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance1.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance1.ionViewWillLeave).toHaveBeenCalled(); - expect(instance1.ionViewDidLeave).toHaveBeenCalled(); - expect(instance1.ionViewWillUnload).toHaveBeenCalled(); + expect(instance2.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance2.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance2.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance2.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance2.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance2.ionViewWillLeave).toHaveBeenCalled(); + expect(instance2.ionViewDidLeave).toHaveBeenCalled(); + expect(instance2.ionViewWillUnload).toHaveBeenCalled(); - expect(instance2.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance2.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance2.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance2.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance2.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance2.ionViewWillLeave).toHaveBeenCalled(); - expect(instance2.ionViewDidLeave).toHaveBeenCalled(); - expect(instance2.ionViewWillUnload).toHaveBeenCalled(); + expect(instance3.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance3.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance3.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance3.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance3.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance3.ionViewWillLeave).not.toHaveBeenCalled(); + expect(instance3.ionViewDidLeave).not.toHaveBeenCalled(); + expect(instance3.ionViewWillUnload).not.toHaveBeenCalled(); - expect(instance3.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance3.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance3.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance3.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance3.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance3.ionViewWillLeave).not.toHaveBeenCalled(); - expect(instance3.ionViewDidLeave).not.toHaveBeenCalled(); - expect(instance3.ionViewWillUnload).not.toHaveBeenCalled(); - - let hasCompleted = true; - let requiresTransition = false; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, undefined, undefined, undefined - ); - expect(nav.length()).toEqual(1); - expect(nav.getByIndex(0).component).toEqual(MockView3); + let hasCompleted = true; + let requiresTransition = false; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, undefined, undefined, undefined + ); + expect(nav.length()).toEqual(1); + expect(nav.getByIndex(0).component).toEqual(MockView3); + done(); + }).catch((err: Error) => { + done(err); + }); }); - it('should set a ViewController as the root when its the middle view, with transition', () => { + it('should set a ViewController as the root when its the middle view, with transition', (done: Function) => { let view1 = mockView(MockView1); let view2 = mockView(MockView2); let view3 = mockView(MockView3); @@ -795,45 +835,49 @@ describe('NavController', () => { let instance2 = spyOnLifecycles(view2); let instance3 = spyOnLifecycles(view3); - nav.setRoot(view2, null, null, trnsDone); + nav.setRoot(view2, null, null, trnsDone).then(() => { + expect(instance1.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance1.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance1.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance1.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance1.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance1.ionViewWillLeave).toHaveBeenCalled(); + expect(instance1.ionViewDidLeave).toHaveBeenCalled(); + expect(instance1.ionViewWillUnload).toHaveBeenCalled(); - expect(instance1.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance1.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance1.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance1.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance1.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance1.ionViewWillLeave).toHaveBeenCalled(); - expect(instance1.ionViewDidLeave).toHaveBeenCalled(); - expect(instance1.ionViewWillUnload).toHaveBeenCalled(); + expect(instance2.ionViewDidLoad).toHaveBeenCalled(); + expect(instance2.ionViewCanEnter).toHaveBeenCalled(); + expect(instance2.ionViewWillEnter).toHaveBeenCalled(); + expect(instance2.ionViewDidEnter).toHaveBeenCalled(); + expect(instance2.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance2.ionViewWillLeave).not.toHaveBeenCalled(); + expect(instance2.ionViewDidLeave).not.toHaveBeenCalled(); + expect(instance2.ionViewWillUnload).not.toHaveBeenCalled(); - expect(instance2.ionViewDidLoad).toHaveBeenCalled(); - expect(instance2.ionViewCanEnter).toHaveBeenCalled(); - expect(instance2.ionViewWillEnter).toHaveBeenCalled(); - expect(instance2.ionViewDidEnter).toHaveBeenCalled(); - expect(instance2.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance2.ionViewWillLeave).not.toHaveBeenCalled(); - expect(instance2.ionViewDidLeave).not.toHaveBeenCalled(); - expect(instance2.ionViewWillUnload).not.toHaveBeenCalled(); + expect(instance3.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance3.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance3.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance3.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance3.ionViewCanLeave).toHaveBeenCalled(); + expect(instance3.ionViewWillLeave).toHaveBeenCalled(); + expect(instance3.ionViewDidLeave).toHaveBeenCalled(); + expect(instance3.ionViewWillUnload).toHaveBeenCalled(); - expect(instance3.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance3.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance3.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance3.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance3.ionViewCanLeave).toHaveBeenCalled(); - expect(instance3.ionViewWillLeave).toHaveBeenCalled(); - expect(instance3.ionViewDidLeave).toHaveBeenCalled(); - expect(instance3.ionViewWillUnload).toHaveBeenCalled(); + let hasCompleted = true; + let requiresTransition = true; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView2', 'MockView3', DIRECTION_BACK + ); + expect(nav.length()).toEqual(1); + expect(nav.getByIndex(0).component).toEqual(MockView2); - let hasCompleted = true; - let requiresTransition = true; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView2', 'MockView3', DIRECTION_BACK - ); - expect(nav.length()).toEqual(1); - expect(nav.getByIndex(0).component).toEqual(MockView2); + done(); + }).catch((err: Error) => { + done(err); + }); }); - it('should set a ViewController as the root when its the first view, with transition', () => { + it('should set a ViewController as the root when its the first view, with transition', (done: Function) => { let view1 = mockView(MockView1); let view2 = mockView(MockView2); let view3 = mockView(MockView3); @@ -843,45 +887,49 @@ describe('NavController', () => { let instance2 = spyOnLifecycles(view2); let instance3 = spyOnLifecycles(view3); - nav.setRoot(view1, null, null, trnsDone); + nav.setRoot(view1, null, null, trnsDone).then(() => { + expect(instance1.ionViewDidLoad).toHaveBeenCalled(); + expect(instance1.ionViewCanEnter).toHaveBeenCalled(); + expect(instance1.ionViewWillEnter).toHaveBeenCalled(); + expect(instance1.ionViewDidEnter).toHaveBeenCalled(); + expect(instance1.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance1.ionViewWillLeave).not.toHaveBeenCalled(); + expect(instance1.ionViewDidLeave).not.toHaveBeenCalled(); + expect(instance1.ionViewWillUnload).not.toHaveBeenCalled(); - expect(instance1.ionViewDidLoad).toHaveBeenCalled(); - expect(instance1.ionViewCanEnter).toHaveBeenCalled(); - expect(instance1.ionViewWillEnter).toHaveBeenCalled(); - expect(instance1.ionViewDidEnter).toHaveBeenCalled(); - expect(instance1.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance1.ionViewWillLeave).not.toHaveBeenCalled(); - expect(instance1.ionViewDidLeave).not.toHaveBeenCalled(); - expect(instance1.ionViewWillUnload).not.toHaveBeenCalled(); + expect(instance2.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance2.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance2.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance2.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance2.ionViewCanLeave).not.toHaveBeenCalled(); + expect(instance2.ionViewWillLeave).toHaveBeenCalled(); + expect(instance2.ionViewDidLeave).toHaveBeenCalled(); + expect(instance2.ionViewWillUnload).toHaveBeenCalled(); - expect(instance2.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance2.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance2.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance2.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance2.ionViewCanLeave).not.toHaveBeenCalled(); - expect(instance2.ionViewWillLeave).toHaveBeenCalled(); - expect(instance2.ionViewDidLeave).toHaveBeenCalled(); - expect(instance2.ionViewWillUnload).toHaveBeenCalled(); + expect(instance3.ionViewDidLoad).not.toHaveBeenCalled(); + expect(instance3.ionViewCanEnter).not.toHaveBeenCalled(); + expect(instance3.ionViewWillEnter).not.toHaveBeenCalled(); + expect(instance3.ionViewDidEnter).not.toHaveBeenCalled(); + expect(instance3.ionViewCanLeave).toHaveBeenCalled(); + expect(instance3.ionViewWillLeave).toHaveBeenCalled(); + expect(instance3.ionViewDidLeave).toHaveBeenCalled(); + expect(instance3.ionViewWillUnload).toHaveBeenCalled(); - expect(instance3.ionViewDidLoad).not.toHaveBeenCalled(); - expect(instance3.ionViewCanEnter).not.toHaveBeenCalled(); - expect(instance3.ionViewWillEnter).not.toHaveBeenCalled(); - expect(instance3.ionViewDidEnter).not.toHaveBeenCalled(); - expect(instance3.ionViewCanLeave).toHaveBeenCalled(); - expect(instance3.ionViewWillLeave).toHaveBeenCalled(); - expect(instance3.ionViewDidLeave).toHaveBeenCalled(); - expect(instance3.ionViewWillUnload).toHaveBeenCalled(); + let hasCompleted = true; + let requiresTransition = true; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView1', 'MockView3', DIRECTION_BACK + ); + expect(nav.length()).toEqual(1); + expect(nav.getByIndex(0).component).toEqual(MockView1); - let hasCompleted = true; - let requiresTransition = true; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView1', 'MockView3', DIRECTION_BACK - ); - expect(nav.length()).toEqual(1); - expect(nav.getByIndex(0).component).toEqual(MockView1); + done(); + }).catch((err: Error) => { + done(err); + }); }); - it('should set a page component as the root, with transition', () => { + it('should set a page component as the root, with transition', (done: Function) => { let view1 = mockView(MockView1); let view2 = mockView(MockView2); let view3 = mockView(MockView3); @@ -891,26 +939,28 @@ describe('NavController', () => { let instance2 = spyOnLifecycles(view2); let instance3 = spyOnLifecycles(view3); - nav.setRoot(MockView4, null, null, trnsDone); + nav.setRoot(MockView4, null, null, trnsDone).then(() => { + expect(instance1.ionViewWillUnload).toHaveBeenCalled(); + expect(instance2.ionViewWillUnload).toHaveBeenCalled(); + expect(instance3.ionViewWillUnload).toHaveBeenCalled(); - expect(instance1.ionViewWillUnload).toHaveBeenCalled(); - expect(instance2.ionViewWillUnload).toHaveBeenCalled(); - expect(instance3.ionViewWillUnload).toHaveBeenCalled(); - - let hasCompleted = true; - let requiresTransition = true; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView4', 'MockView3', DIRECTION_BACK - ); - expect(nav.length()).toEqual(1); - expect(nav.getByIndex(0).component).toEqual(MockView4); + let hasCompleted = true; + let requiresTransition = true; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView4', 'MockView3', DIRECTION_BACK + ); + expect(nav.length()).toEqual(1); + expect(nav.getByIndex(0).component).toEqual(MockView4); + done(); + }).catch((err: Error) => { + done(err); + }); }); - }); describe('setPages', () => { - it('should set the pages from an array, starting at the root, with transition', () => { + it('should set the pages from an array, starting at the root, with transition', (done: Function) => { let view1 = mockView(MockView1); let view2 = mockView(MockView2); mockViews(nav, [view1, view2]); @@ -918,19 +968,22 @@ describe('NavController', () => { let instance1 = spyOnLifecycles(view1); let instance2 = spyOnLifecycles(view2); - nav.setPages([{page: MockView4}, {page: MockView5}], null, trnsDone); + nav.setPages([{page: MockView4}, {page: MockView5}], null, trnsDone).then(() => { + expect(instance1.ionViewWillUnload).toHaveBeenCalled(); + expect(instance2.ionViewWillUnload).toHaveBeenCalled(); - expect(instance1.ionViewWillUnload).toHaveBeenCalled(); - expect(instance2.ionViewWillUnload).toHaveBeenCalled(); - - let hasCompleted = true; - let requiresTransition = true; - expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, 'MockView5', 'MockView2', DIRECTION_BACK - ); - expect(nav.length()).toEqual(2); - expect(nav.getByIndex(0).component).toEqual(MockView4); - expect(nav.getByIndex(1).component).toEqual(MockView5); + let hasCompleted = true; + let requiresTransition = true; + expect(trnsDone).toHaveBeenCalledWith( + hasCompleted, requiresTransition, 'MockView5', 'MockView2', DIRECTION_BACK + ); + expect(nav.length()).toEqual(2); + expect(nav.getByIndex(0).component).toEqual(MockView4); + expect(nav.getByIndex(1).component).toEqual(MockView5); + done(); + }).catch((err: Error) => { + done(err); + }); }); }); diff --git a/src/navigation/test/nav-util.spec.ts b/src/navigation/test/nav-util.spec.ts index 23b757689f..0f2bd71c81 100644 --- a/src/navigation/test/nav-util.spec.ts +++ b/src/navigation/test/nav-util.spec.ts @@ -7,85 +7,128 @@ describe('NavUtil', () => { describe('convertToViews', () => { - it('should convert all page components', () => { + it('should convert all page components', (done) => { let linker = mockDeepLinker(); let pages = [{ page: MockView }, { page: MockView }, { page: MockView }]; - let views = convertToViews(linker, pages); - expect(views.length).toEqual(3); - expect(views[0].component).toEqual(MockView); - expect(views[1].component).toEqual(MockView); - expect(views[2].component).toEqual(MockView); + + convertToViews(linker, pages).then(views => { + expect(views.length).toEqual(3); + expect(views[0].component).toEqual(MockView); + expect(views[1].component).toEqual(MockView); + expect(views[2].component).toEqual(MockView); + + done(); + }); }); - it('should convert all string names', () => { + it('should convert all string names', (done) => { let linker = mockDeepLinker({ links: [{ component: MockView, name: 'someName' }] }); let pages = ['someName', 'someName', 'someName']; - let views = convertToViews(linker, pages); - expect(views.length).toEqual(3); - expect(views[0].component).toEqual(MockView); - expect(views[1].component).toEqual(MockView); - expect(views[2].component).toEqual(MockView); + + convertToViews(linker, pages).then(views => { + expect(views.length).toEqual(3); + expect(views[0].component).toEqual(MockView); + expect(views[1].component).toEqual(MockView); + expect(views[2].component).toEqual(MockView); + + done(); + }); }); - it('should convert all page string names', () => { + it('should convert all page string names', (done) => { let linker = mockDeepLinker({ links: [{ component: MockView, name: 'someName' }] }); let pages = [{ page: 'someName' }, { page: 'someName' }, { page: 'someName' }]; - let views = convertToViews(linker, pages); - expect(views.length).toEqual(3); - expect(views[0].component).toEqual(MockView); - expect(views[1].component).toEqual(MockView); - expect(views[2].component).toEqual(MockView); + + convertToViews(linker, pages).then(views => { + expect(views.length).toEqual(3); + expect(views[0].component).toEqual(MockView); + expect(views[1].component).toEqual(MockView); + expect(views[2].component).toEqual(MockView); + + done(); + }); }); - it('should convert all ViewControllers', () => { + it('should convert all ViewControllers', (done) => { let pages = [mockView(MockView), mockView(MockView), mockView(MockView)]; let linker = mockDeepLinker(); - let views = convertToViews(linker, pages); - expect(views.length).toEqual(3); - expect(views[0].component).toEqual(MockView); - expect(views[1].component).toEqual(MockView); - expect(views[2].component).toEqual(MockView); + + convertToViews(linker, pages).then(views => { + expect(views.length).toEqual(3); + expect(views[0].component).toEqual(MockView); + expect(views[1].component).toEqual(MockView); + expect(views[2].component).toEqual(MockView); + + done(); + }); }); }); describe('convertToView', () => { - it('should return new ViewController instance from page component link config name', () => { + it('should return new ViewController instance from page component link config name', (done) => { let linker = mockDeepLinker({ links: [{ component: MockView, name: 'someName' }] }); - let outputView = convertToView(linker, 'someName', null); - expect(outputView.component).toEqual(MockView); + + convertToView(linker, 'someName', null).then(view => { + expect(view.component).toEqual(MockView); + + done(); + }); }); - it('should return new ViewController instance from page component', () => { + it('should return new ViewController instance from page component', (done) => { let linker = mockDeepLinker(); - let outputView = convertToView(linker, MockView, null); - expect(outputView.component).toEqual(MockView); + + convertToView(linker, MockView, null).then(view => { + expect(view.component).toEqual(MockView); + + done(); + }); }); - it('should return existing ViewController instance', () => { + it('should return existing ViewController instance', (done) => { let linker = mockDeepLinker(); let inputView = new ViewController(MockView); - let outputView = convertToView(linker, inputView, null); - expect(outputView).toEqual(inputView); + + convertToView(linker, inputView, null).then(outputView => { + expect(outputView).toEqual(inputView); + + done(); + }); }); - it('should return null for null/undefined/number', () => { + it('should return null for null', (done) => { let linker = mockDeepLinker(); - let outputView = convertToView(linker, null, null); - expect(outputView).toEqual(null); + convertToView(linker, null, null).then(view => { + expect(view).toEqual(null); - outputView = convertToView(linker, undefined, undefined); - expect(outputView).toEqual(null); + done(); + }); + }); - outputView = convertToView(linker, 8675309, null); - expect(outputView).toEqual(null); + it('should return null for undefined', (done) => { + let linker = mockDeepLinker(); + convertToView(linker, undefined, undefined).then(view => { + expect(view).toEqual(null); + + done(); + }); + }); + + it('should return null for number', (done) => { + let linker = mockDeepLinker(); + convertToView(linker, 8675309, null).then(view => { + expect(view).toEqual(null); + + done(); + }); }); }); diff --git a/src/navigation/test/url-serializer.spec.ts b/src/navigation/test/url-serializer.spec.ts index a8baed43b0..014ac03e5c 100644 --- a/src/navigation/test/url-serializer.spec.ts +++ b/src/navigation/test/url-serializer.spec.ts @@ -13,36 +13,36 @@ describe('UrlSerializer', () => { const link3 = { component: MockView1, name: 'viewthree', segment: 'view/:param1/:param2' }; serializer = mockSerializer([link1, link2, link3]); - serializer.createSegment = noop; - spyOn(serializer, 'createSegment'); + serializer._createSegment = noop; + spyOn(serializer, '_createSegment'); serializer.serializeComponent(MockView1, null); - expect(serializer.createSegment).toHaveBeenCalledWith(link1, null); + expect(serializer._createSegment).toHaveBeenCalledWith(link1, null); }); it('should create segment if component found in links', () => { - serializer.createSegment = noop; - spyOn(serializer, 'createSegment'); + serializer._createSegment = noop; + spyOn(serializer, '_createSegment'); serializer.serializeComponent(MockView1, null); - expect(serializer.createSegment).toHaveBeenCalled(); + expect(serializer._createSegment).toHaveBeenCalled(); }); it('should return null if component not found in links', () => { - serializer.createSegment = noop; - spyOn(serializer, 'createSegment'); + serializer._createSegment = noop; + spyOn(serializer, '_createSegment'); serializer.serializeComponent(NotFound, null); - expect(serializer.createSegment).not.toHaveBeenCalled(); + expect(serializer._createSegment).not.toHaveBeenCalled(); }); it('should create tab segment if component found in deep links', () => { - serializer.createSegment = noop; - spyOn(serializer, 'createSegment'); + serializer._createSegment = noop; + spyOn(serializer, '_createSegment'); serializer.serializeComponent(MockView1, null); - expect(serializer.createSegment).toHaveBeenCalled(); + expect(serializer._createSegment).toHaveBeenCalled(); }); }); - describe('createSegment', () => { + describe('_createSegment', () => { it('should create segement path data', () => { let link: NavLink = { @@ -53,7 +53,7 @@ describe('UrlSerializer', () => { id: 8675309, name: 'jenny' }; - let p = serializer.createSegment(link, data); + let p = serializer._createSegment(link, data); expect(p.id).toEqual('a/8675309/jenny'); expect(p.component).toEqual(MockView1); }); @@ -69,7 +69,7 @@ describe('UrlSerializer', () => { let data: any = { id: char }; - let p = serializer.createSegment(link, data); + let p = serializer._createSegment(link, data); expect(p.id).toEqual('a/' + encoded); expect(p.component).toEqual(MockView1); expect(p.data.id).toEqual(char); @@ -80,7 +80,7 @@ describe('UrlSerializer', () => { parts: ['a'], component: MockView1 }; - let p = serializer.createSegment(link, null); + let p = serializer._createSegment(link, null); expect(p.id).toEqual('a'); expect(p.component).toEqual(MockView1); expect(p.data).toEqual(null);