From 7b5bb940c972d88462e29c8567972dc45c717af5 Mon Sep 17 00:00:00 2001 From: Daniel Imhoff Date: Fri, 3 Mar 2017 16:57:38 -0600 Subject: [PATCH] test(e2e): popover/basic --- .../popover/test/basic/app/app.component.ts | 9 ++ .../popover/test/basic/app/app.module.ts | 27 ++++ .../popover/test/basic/{ => app}/main.ts | 0 .../test/basic/{ => pages/main}/main.html | 0 .../test/basic/pages/main/main.module.ts | 17 +++ .../popover/test/basic/pages/main/main.ts | 46 +++++++ .../popover-list-page.module.ts | 17 +++ .../popover-list-page/popover-list-page.ts | 23 ++++ .../popover-long-list-page.module.ts | 17 +++ .../popover-long-list-page.ts | 21 +++ .../popover-radio-page.module.ts | 17 +++ .../popover-radio-page/popover-radio-page.ts} | 125 +----------------- 12 files changed, 196 insertions(+), 123 deletions(-) create mode 100644 src/components/popover/test/basic/app/app.component.ts create mode 100644 src/components/popover/test/basic/app/app.module.ts rename src/components/popover/test/basic/{ => app}/main.ts (100%) rename src/components/popover/test/basic/{ => pages/main}/main.html (100%) create mode 100644 src/components/popover/test/basic/pages/main/main.module.ts create mode 100644 src/components/popover/test/basic/pages/main/main.ts create mode 100644 src/components/popover/test/basic/pages/popover-list-page/popover-list-page.module.ts create mode 100644 src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts create mode 100644 src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.module.ts create mode 100644 src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts create mode 100644 src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.module.ts rename src/components/popover/test/basic/{app.module.ts => pages/popover-radio-page/popover-radio-page.ts} (60%) diff --git a/src/components/popover/test/basic/app/app.component.ts b/src/components/popover/test/basic/app/app.component.ts new file mode 100644 index 0000000000..7d10722bb9 --- /dev/null +++ b/src/components/popover/test/basic/app/app.component.ts @@ -0,0 +1,9 @@ +import { Component, ViewEncapsulation } from '@angular/core'; + +@Component({ + template: '', + encapsulation: ViewEncapsulation.None +}) +export class E2EApp { + root = 'E2EPage'; +} diff --git a/src/components/popover/test/basic/app/app.module.ts b/src/components/popover/test/basic/app/app.module.ts new file mode 100644 index 0000000000..314b572a34 --- /dev/null +++ b/src/components/popover/test/basic/app/app.module.ts @@ -0,0 +1,27 @@ +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' }, + { loadChildren: '../pages/popover-long-list-page/popover-long-list-page.module#PopoverLongListPageModule', name: 'PopoverLongListPage' }, + { loadChildren: '../pages/popover-list-page/popover-list-page.module#PopoverListPageModule', name: 'PopoverListPage' }, + { loadChildren: '../pages/popover-radio-page/popover-radio-page.module#PopoverRadioPageModule', name: 'PopoverRadioPage' }, + ] + }) + ], + bootstrap: [IonicApp], + entryComponents: [ + E2EApp, + ] +}) +export class AppModule {} diff --git a/src/components/popover/test/basic/main.ts b/src/components/popover/test/basic/app/main.ts similarity index 100% rename from src/components/popover/test/basic/main.ts rename to src/components/popover/test/basic/app/main.ts diff --git a/src/components/popover/test/basic/main.html b/src/components/popover/test/basic/pages/main/main.html similarity index 100% rename from src/components/popover/test/basic/main.html rename to src/components/popover/test/basic/pages/main/main.html diff --git a/src/components/popover/test/basic/pages/main/main.module.ts b/src/components/popover/test/basic/pages/main/main.module.ts new file mode 100644 index 0000000000..1cc785fd59 --- /dev/null +++ b/src/components/popover/test/basic/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/popover/test/basic/pages/main/main.ts b/src/components/popover/test/basic/pages/main/main.ts new file mode 100644 index 0000000000..eb99191c65 --- /dev/null +++ b/src/components/popover/test/basic/pages/main/main.ts @@ -0,0 +1,46 @@ +import { Component, ViewChild, ElementRef } from '@angular/core'; + +import { PopoverController } from '../../../../../..'; + +@Component({ + templateUrl: 'main.html', + selector: 'e2e-popover-basic' +}) +export class E2EPage { + @ViewChild('popoverContent', {read: ElementRef}) content: ElementRef; + @ViewChild('popoverText', {read: ElementRef}) text: ElementRef; + + constructor(private popoverCtrl: PopoverController) {} + + presentListPopover(ev: UIEvent) { + let popover = this.popoverCtrl.create('PopoverListPage'); + popover.present({ + ev: ev + }); + } + + presentLongListPopover(ev: UIEvent) { + let popover = this.popoverCtrl.create('PopoverLongListPage', {}, { + cssClass: 'my-popover popover-class' + }); + popover.present({ + ev: ev + }); + } + + presentRadioPopover(ev: UIEvent) { + let popover = this.popoverCtrl.create('PopoverRadioPage', { + contentEle: this.content.nativeElement, + textEle: this.text.nativeElement + }); + + popover.present({ + ev: ev + }); + } + + presentNoEventPopover() { + this.popoverCtrl.create('PopoverListPage').present(); + } + +} diff --git a/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.module.ts b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.module.ts new file mode 100644 index 0000000000..e549869b33 --- /dev/null +++ b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PopoverListPage } from './popover-list-page'; + +@NgModule({ + declarations: [ + PopoverListPage, + ], + imports: [ + DeepLinkModule.forChild(PopoverListPage) + ], + entryComponents: [ + PopoverListPage, + ] +}) +export class PopoverListPageModule {} diff --git a/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts new file mode 100644 index 0000000000..a6196ecd4a --- /dev/null +++ b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts @@ -0,0 +1,23 @@ +import { Component } from '@angular/core'; +import { ViewController } from '../../../../../..'; + +@Component({ + template: ` + + Ionic + + + +
+

Paragraph text

+ Some more text and danger span. +
+ ` +}) +export class PopoverListPage { + constructor(private viewCtrl: ViewController) {} + + close() { + this.viewCtrl.dismiss(); + } +} diff --git a/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.module.ts b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.module.ts new file mode 100644 index 0000000000..30fb159d50 --- /dev/null +++ b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PopoverLongListPage } from './popover-long-list-page'; + +@NgModule({ + declarations: [ + PopoverLongListPage, + ], + imports: [ + DeepLinkModule.forChild(PopoverLongListPage) + ], + entryComponents: [ + PopoverLongListPage, + ] +}) +export class PopoverLongListPageModule {} diff --git a/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts new file mode 100644 index 0000000000..0bc759b81c --- /dev/null +++ b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts @@ -0,0 +1,21 @@ +import { Component } from '@angular/core'; + +@Component({ + template: ` + + + Ionic + + + + ` +}) +export class PopoverLongListPage { + items: number[] = []; + + ngOnInit() { + for (let i = 1; i < 21; i++) { + this.items.push(i); + } + } +} diff --git a/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.module.ts b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.module.ts new file mode 100644 index 0000000000..cd27fdbae4 --- /dev/null +++ b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { DeepLinkModule } from '../../../../../..'; + +import { PopoverRadioPage } from './popover-radio-page'; + +@NgModule({ + declarations: [ + PopoverRadioPage, + ], + imports: [ + DeepLinkModule.forChild(PopoverRadioPage) + ], + entryComponents: [ + PopoverRadioPage, + ] +}) +export class PopoverRadioPageModule {} diff --git a/src/components/popover/test/basic/app.module.ts b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts similarity index 60% rename from src/components/popover/test/basic/app.module.ts rename to src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts index c4fe55980e..7c8680b22a 100644 --- a/src/components/popover/test/basic/app.module.ts +++ b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts @@ -1,7 +1,5 @@ -import { Component, ViewChild, ElementRef, ViewEncapsulation, NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { IonicApp, IonicModule, PopoverController, NavParams, ViewController } from '../../../..'; - +import { Component } from '@angular/core'; +import { NavParams } from '../../../../../..'; @Component({ template: ` @@ -136,122 +134,3 @@ export class PopoverRadioPage { if (this.fontFamily) this.textEle.style.fontFamily = this.fontFamily; } } - - -@Component({ - template: ` - - Ionic - - - -
-

Paragraph text

- Some more text and danger span. -
- ` -}) -export class PopoverListPage { - constructor(private viewCtrl: ViewController) {} - - close() { - this.viewCtrl.dismiss(); - } -} - - -@Component({ - template: ` - - - Ionic - - - - ` -}) -export class PopoverLongListPage { - items: number[] = []; - - ngOnInit() { - for (let i = 1; i < 21; i++) { - this.items.push(i); - } - } -} - - -@Component({ - templateUrl: 'main.html', - selector: 'e2e-popover-basic' -}) -export class E2EPage { - @ViewChild('popoverContent', {read: ElementRef}) content: ElementRef; - @ViewChild('popoverText', {read: ElementRef}) text: ElementRef; - - constructor(private popoverCtrl: PopoverController) {} - - presentListPopover(ev: UIEvent) { - let popover = this.popoverCtrl.create(PopoverListPage); - popover.present({ - ev: ev - }); - } - - presentLongListPopover(ev: UIEvent) { - let popover = this.popoverCtrl.create(PopoverLongListPage, {}, { - cssClass: 'my-popover popover-class' - }); - popover.present({ - ev: ev - }); - } - - presentRadioPopover(ev: UIEvent) { - let popover = this.popoverCtrl.create(PopoverRadioPage, { - contentEle: this.content.nativeElement, - textEle: this.text.nativeElement - }); - - popover.present({ - ev: ev - }); - } - - presentNoEventPopover() { - this.popoverCtrl.create(PopoverListPage).present(); - } - -} - - -@Component({ - template: '', - encapsulation: ViewEncapsulation.None -}) -export class E2EApp { - root = E2EPage; -} - -@NgModule({ - declarations: [ - E2EApp, - E2EPage, - PopoverRadioPage, - PopoverListPage, - PopoverLongListPage - ], - imports: [ - BrowserModule, - IonicModule.forRoot(E2EApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - E2EApp, - E2EPage, - PopoverRadioPage, - PopoverListPage, - PopoverLongListPage - ] -}) -export class AppModule {}