From 999f33a5b9da275fd43577a83e8c26ee82b60a01 Mon Sep 17 00:00:00 2001 From: Daniel Imhoff Date: Mon, 6 Mar 2017 15:14:20 -0600 Subject: [PATCH] test(e2e): tabs/colors --- .../tabs/test/basic/components/modal/modal.ts | 2 +- src/components/tabs/test/colors/app.module.ts | 52 ------------------- .../tabs/test/colors/app/app.component.ts | 28 ++++++++++ .../test/colors/{main.html => app/app.html} | 0 .../tabs/test/colors/app/app.module.ts | 24 +++++++++ .../tabs/test/colors/{ => app}/main.ts | 0 .../test/colors/pages/main/main.module.ts | 17 ++++++ .../tabs/test/colors/pages/main/main.ts | 4 ++ 8 files changed, 74 insertions(+), 53 deletions(-) delete mode 100644 src/components/tabs/test/colors/app.module.ts create mode 100644 src/components/tabs/test/colors/app/app.component.ts rename src/components/tabs/test/colors/{main.html => app/app.html} (100%) create mode 100644 src/components/tabs/test/colors/app/app.module.ts rename src/components/tabs/test/colors/{ => app}/main.ts (100%) create mode 100644 src/components/tabs/test/colors/pages/main/main.module.ts create mode 100644 src/components/tabs/test/colors/pages/main/main.ts diff --git a/src/components/tabs/test/basic/components/modal/modal.ts b/src/components/tabs/test/basic/components/modal/modal.ts index f68a0fe5ef..bb4f816b0a 100644 --- a/src/components/tabs/test/basic/components/modal/modal.ts +++ b/src/components/tabs/test/basic/components/modal/modal.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { App, AlertController, ViewController } from '../../../../../..'; +import { App, ViewController } from '../../../../../..'; @Component({ template: ` diff --git a/src/components/tabs/test/colors/app.module.ts b/src/components/tabs/test/colors/app.module.ts deleted file mode 100644 index 8295138093..0000000000 --- a/src/components/tabs/test/colors/app.module.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { Component, ViewEncapsulation, NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule } from '../../../..'; - - -@Component({template: 'hi'}) -export class E2EPage {} - - -@Component({ - templateUrl: 'main.html', - encapsulation: ViewEncapsulation.None, - styles: [ - ` - ion-tabs { - margin-bottom: 20px; - contain: none; - } - `, - - ` - ion-tabs, - ion-tabs ion-tabbar { - position: relative; - top: auto; - height: auto; - visibility: visible; - opacity: 1; - } - ` - ] -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage - ], - imports: [ - BrowserModule, - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage - ] -}) -export class AppModule {} diff --git a/src/components/tabs/test/colors/app/app.component.ts b/src/components/tabs/test/colors/app/app.component.ts new file mode 100644 index 0000000000..ba713b7aa0 --- /dev/null +++ b/src/components/tabs/test/colors/app/app.component.ts @@ -0,0 +1,28 @@ +import { Component, ViewEncapsulation } from '@angular/core'; + +@Component({ + templateUrl: 'app.html', + encapsulation: ViewEncapsulation.None, + styles: [ + ` + ion-tabs { + margin-bottom: 20px; + contain: none; + } + `, + + ` + ion-tabs, + ion-tabs ion-tabbar { + position: relative; + top: auto; + height: auto; + visibility: visible; + opacity: 1; + } + ` + ] +}) +export class E2EApp { + root = 'E2EPage'; +} diff --git a/src/components/tabs/test/colors/main.html b/src/components/tabs/test/colors/app/app.html similarity index 100% rename from src/components/tabs/test/colors/main.html rename to src/components/tabs/test/colors/app/app.html diff --git a/src/components/tabs/test/colors/app/app.module.ts b/src/components/tabs/test/colors/app/app.module.ts new file mode 100644 index 0000000000..791669231e --- /dev/null +++ b/src/components/tabs/test/colors/app/app.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { IonicApp, IonicModule } from '../../../../..'; + +import { E2EApp } from './app.component'; + +@NgModule({ + declarations: [ + E2EApp, + ], + imports: [ + BrowserModule, + IonicModule.forRoot(E2EApp, {}, { + links: [ + { loadChildren: '../pages/main/main.module#E2EPageModule', name: 'E2EPage' }, + ] + }) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + ] +}) +export class AppModule {} diff --git a/src/components/tabs/test/colors/main.ts b/src/components/tabs/test/colors/app/main.ts similarity index 100% rename from src/components/tabs/test/colors/main.ts rename to src/components/tabs/test/colors/app/main.ts diff --git a/src/components/tabs/test/colors/pages/main/main.module.ts b/src/components/tabs/test/colors/pages/main/main.module.ts new file mode 100644 index 0000000000..1cc785fd59 --- /dev/null +++ b/src/components/tabs/test/colors/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/tabs/test/colors/pages/main/main.ts b/src/components/tabs/test/colors/pages/main/main.ts new file mode 100644 index 0000000000..ee769e7472 --- /dev/null +++ b/src/components/tabs/test/colors/pages/main/main.ts @@ -0,0 +1,4 @@ +import { Component } from '@angular/core'; + +@Component({template: 'hi'}) +export class E2EPage {}