From d922485c9083967f319461ee15710c4f161ac4aa Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 14 Jun 2017 15:00:23 -0400
Subject: [PATCH] test(slides): fix slides test to use app and pages

---
 .../slides/test/basic/app.module.ts           | 50 -------------------
 .../slides/test/basic/app/app.component.ts    |  9 ++++
 .../slides/test/basic/app/app.module.ts       | 20 ++++++++
 .../slides/test/basic/{ => app}/main.ts       |  0
 .../root-page/root-page.html}                 |  1 -
 .../basic/pages/root-page/root-page.module.ts | 15 ++++++
 .../test/basic/pages/root-page/root-page.ts   | 20 ++++++++
 .../pages/components/components.module.ts     |  2 +-
 .../test/basic/pages/components/components.ts |  2 +-
 9 files changed, 66 insertions(+), 53 deletions(-)
 delete mode 100644 src/components/slides/test/basic/app.module.ts
 create mode 100644 src/components/slides/test/basic/app/app.component.ts
 create mode 100644 src/components/slides/test/basic/app/app.module.ts
 rename src/components/slides/test/basic/{ => app}/main.ts (100%)
 rename src/components/slides/test/basic/{main.html => pages/root-page/root-page.html} (99%)
 create mode 100644 src/components/slides/test/basic/pages/root-page/root-page.module.ts
 create mode 100644 src/components/slides/test/basic/pages/root-page/root-page.ts

diff --git a/src/components/slides/test/basic/app.module.ts b/src/components/slides/test/basic/app.module.ts
deleted file mode 100644
index 84a7ecb590..0000000000
--- a/src/components/slides/test/basic/app.module.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Component, CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule } from '../../../..';
-
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage {
-
-  onSlideWillChange(s: any) {
-    console.log(`onSlideWillChange: ${s}`);
-  }
-
-  onSlideDidChange(s: any) {
-    console.log(`onSlideDidChange: ${s}`);
-  }
-
-  onSlideDrag(s: any) {
-    console.log(`onSlideDrag: ${s}`);
-  }
-
-}
-
-@Component({
-  template: '<ion-nav [root]="root"></ion-nav>'
-})
-export class AppComponent {
-  root = E2EPage;
-}
-
-@NgModule({
-  declarations: [
-    AppComponent,
-    E2EPage
-  ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(AppComponent)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    AppComponent,
-    E2EPage
-  ],
-  schemas: [
-    CUSTOM_ELEMENTS_SCHEMA
-  ]
-})
-export class AppModule {}
diff --git a/src/components/slides/test/basic/app/app.component.ts b/src/components/slides/test/basic/app/app.component.ts
new file mode 100644
index 0000000000..02ea0906a5
--- /dev/null
+++ b/src/components/slides/test/basic/app/app.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+import { RootPage } from '../pages/root-page/root-page';
+
+@Component({
+  template: `<ion-nav [root]="root"></ion-nav>`
+})
+export class AppComponent {
+  root = RootPage;
+}
diff --git a/src/components/slides/test/basic/app/app.module.ts b/src/components/slides/test/basic/app/app.module.ts
new file mode 100644
index 0000000000..af476c61f8
--- /dev/null
+++ b/src/components/slides/test/basic/app/app.module.ts
@@ -0,0 +1,20 @@
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { IonicApp, IonicModule } from '../../../../..';
+
+import { AppComponent } from './app.component';
+import { RootPageModule } from '../pages/root-page/root-page.module';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(AppComponent, {}),
+    RootPageModule
+  ],
+  bootstrap: [IonicApp],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class AppModule { }
diff --git a/src/components/slides/test/basic/main.ts b/src/components/slides/test/basic/app/main.ts
similarity index 100%
rename from src/components/slides/test/basic/main.ts
rename to src/components/slides/test/basic/app/main.ts
diff --git a/src/components/slides/test/basic/main.html b/src/components/slides/test/basic/pages/root-page/root-page.html
similarity index 99%
rename from src/components/slides/test/basic/main.html
rename to src/components/slides/test/basic/pages/root-page/root-page.html
index 201749ed5e..02325052f5 100644
--- a/src/components/slides/test/basic/main.html
+++ b/src/components/slides/test/basic/pages/root-page/root-page.html
@@ -1,4 +1,3 @@
-
 <ion-slides style="background: black"
             (ionSlideWillChange)="onSlideWillChange($event)"
             (ionSlideDidChange)="onSlideDidChange($event)"
diff --git a/src/components/slides/test/basic/pages/root-page/root-page.module.ts b/src/components/slides/test/basic/pages/root-page/root-page.module.ts
new file mode 100644
index 0000000000..a733cb4529
--- /dev/null
+++ b/src/components/slides/test/basic/pages/root-page/root-page.module.ts
@@ -0,0 +1,15 @@
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { IonicPageModule } from '../../../../../..';
+
+import { RootPage } from './root-page';
+
+@NgModule({
+  declarations: [
+    RootPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(RootPage)
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class RootPageModule {}
diff --git a/src/components/slides/test/basic/pages/root-page/root-page.ts b/src/components/slides/test/basic/pages/root-page/root-page.ts
new file mode 100644
index 0000000000..4fca954ca4
--- /dev/null
+++ b/src/components/slides/test/basic/pages/root-page/root-page.ts
@@ -0,0 +1,20 @@
+import { Component } from '@angular/core';
+
+@Component({
+  templateUrl: 'root-page.html'
+})
+export class RootPage {
+
+  onSlideWillChange(s: any) {
+    console.log(`onSlideWillChange: ${s}`);
+  }
+
+  onSlideDidChange(s: any) {
+    console.log(`onSlideDidChange: ${s}`);
+  }
+
+  onSlideDrag(s: any) {
+    console.log(`onSlideDrag: ${s}`);
+  }
+
+}
diff --git a/src/components/snapshot/test/basic/pages/components/components.module.ts b/src/components/snapshot/test/basic/pages/components/components.module.ts
index 5a6a152046..d28ca2beb2 100644
--- a/src/components/snapshot/test/basic/pages/components/components.module.ts
+++ b/src/components/snapshot/test/basic/pages/components/components.module.ts
@@ -155,7 +155,7 @@ import { AppModule as SelectSingleValue } from '../../../../../select/test/singl
 
 import { AppModule as ShowHideWhenBasic } from '../../../../../show-hide-when/test/basic/app.module';
 
-import { AppModule as SlidesBasic } from '../../../../../slides/test/basic/app.module';
+import { AppModule as SlidesBasic } from '../../../../../slides/test/basic/app/app.module';
 import { AppModule as SlidesControl } from '../../../../../slides/test/control/app.module';
 import { AppModule as SlidesController } from '../../../../../slides/test/controller/app.module';
 import { AppModule as SlidesImages } from '../../../../../slides/test/images/app.module';
diff --git a/src/components/snapshot/test/basic/pages/components/components.ts b/src/components/snapshot/test/basic/pages/components/components.ts
index 750882d634..f6616bc5f7 100644
--- a/src/components/snapshot/test/basic/pages/components/components.ts
+++ b/src/components/snapshot/test/basic/pages/components/components.ts
@@ -156,7 +156,7 @@ import { AppComponent as SelectSingleValue } from '../../../../../select/test/si
 
 import { AppComponent as ShowHideWhenBasic } from '../../../../../show-hide-when/test/basic/app.module';
 
-import { AppComponent as SlidesBasic } from '../../../../../slides/test/basic/app.module';
+import { AppComponent as SlidesBasic } from '../../../../../slides/test/basic/app/app.component';
 import { AppComponent as SlidesControl } from '../../../../../slides/test/control/app.module';
 import { AppComponent as SlidesController } from '../../../../../slides/test/controller/app.module';
 import { AppComponent as SlidesImages } from '../../../../../slides/test/images/app.module';