test(ngmodule): update to ngmodule

src/components/checkbox/test/basic/app-module.ts

@@ -1,13 +1,12 @@
-import { Component } from '@angular/core';
+import { Component, NgModule } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { ionicBootstrap, Checkbox } from '../../../../../src';
+import { IonicApp, IonicModule, Checkbox } from '../../../..';
 
 
 @Component({
   templateUrl: 'main.html'
 })
-class E2EPage {
-  fruitsForm: FormGroup;
+export class E2EPage {
   grapeDisabled: boolean;
   grapeChecked: boolean;
   kiwiValue: boolean;
@@ -16,14 +15,19 @@ class E2EPage {
   formResults: string;
   dangerColor: string = 'danger';
 
-  constructor() {
-    this.fruitsForm = new FormGroup({
-      'appleCtrl': new FormControl(true),
-      'bananaCtrl': new FormControl(true),
-      'cherryCtrl': new FormControl(false),
-      'grapeCtrl': new FormControl(true)
-    });
+  appleCtrl = new FormControl(true);
+  bananaCtrl = new FormControl(true);
+  cherryCtrl = new FormControl(false);
+  grapeCtrl = new FormControl(true);
 
+  fruitsForm = new FormGroup({
+    'apple': this.appleCtrl,
+    'banana': this.bananaCtrl,
+    'cherry': this.cherryCtrl,
+    'grape': this.grapeCtrl
+  });
+
+  constructor() {
     this.grapeDisabled = true;
     this.grapeChecked = true;
     this.standAloneChecked = true;
@@ -57,8 +61,22 @@ class E2EPage {
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-class E2EApp {
+export class E2EApp {
   rootPage = E2EPage;
 }
 
-ionicBootstrap(E2EApp);
+@NgModule({
+  declarations: [
+    E2EApp,
+    E2EPage
+  ],
+  imports: [
+    IonicModule.forRoot(E2EApp)
+  ],
+  bootstrap: [IonicApp],
+  entryComponents: [
+    E2EPage
+  ]
+})
+export class AppModule {}
+

src/components/checkbox/test/basic/e2e.ts

@@ -1,6 +1,6 @@
 
 it('should check apple, enable/check grape, submit form', function() {
-  element(by.css('[formControlName=appleCtrl]')).click();
+  element(by.css('[formControlName=apple]')).click();
   element(by.css('.e2eGrapeDisabled')).click();
   element(by.css('.e2eGrapeChecked')).click();
   element(by.css('.e2eSubmit')).click();

src/components/checkbox/test/basic/main.html

@@ -15,22 +15,22 @@
 
       <ion-item>
         <ion-label>Apple, formControlName</ion-label>
-        <ion-checkbox formControlName="appleCtrl"></ion-checkbox>
+        <ion-checkbox formControlName="apple"></ion-checkbox>
       </ion-item>
 
       <ion-item>
         <ion-label>Banana, formControlName</ion-label>
-        <ion-checkbox formControlName="bananaCtrl"></ion-checkbox>
+        <ion-checkbox formControlName="banana"></ion-checkbox>
       </ion-item>
 
       <ion-item>
         <ion-label>Cherry, formControlName, disabled</ion-label>
-        <ion-checkbox disabled="true" formControlName="cherryCtrl"></ion-checkbox>
+        <ion-checkbox disabled="true" formControlName="cherry"></ion-checkbox>
       </ion-item>
 
       <ion-item>
         <ion-label>Grape, formControlName, checked, disabled</ion-label>
-        <ion-checkbox [checked]="grapeChecked" [disabled]="grapeDisabled" formControlName="grapeCtrl"></ion-checkbox>
+        <ion-checkbox [checked]="grapeChecked" [disabled]="grapeDisabled" formControlName="grape"></ion-checkbox>
       </ion-item>
 
       <ion-item>
@@ -74,14 +74,14 @@
   </p>
 
   <p aria-hidden="true" padding>
-    <code>appleCtrl.dirty: {{fruitsForm.controls.appleCtrl.dirty}}</code><br>
-    <code>appleCtrl.value: {{fruitsForm.controls.appleCtrl.value}}</code><br>
-    <code>bananaCtrl.dirty: {{fruitsForm.controls.bananaCtrl.dirty}}</code><br>
-    <code>bananaCtrl.value: {{fruitsForm.controls.bananaCtrl.value}}</code><br>
-    <code>cherry.dirty: {{fruitsForm.controls.cherryCtrl.dirty}}</code><br>
-    <code>cherry.value: {{fruitsForm.controls.cherryCtrl.value}}</code><br>
-    <code>grape.dirty: {{fruitsForm.controls.grapeCtrl.dirty}}</code><br>
-    <code>grape.value: {{fruitsForm.controls.grapeCtrl.value}}</code><br>
+    <code>appleCtrl.dirty: {{appleCtrl.dirty}}</code><br>
+    <code>appleCtrl.value: {{appleCtrl.value}}</code><br>
+    <code>bananaCtrl.dirty: {{bananaCtrl.dirty}}</code><br>
+    <code>bananaCtrl.value: {{bananaCtrl.value}}</code><br>
+    <code>cherry.dirty: {{cherryCtrl.dirty}}</code><br>
+    <code>cherry.value: {{cherryCtrl.value}}</code><br>
+    <code>grape.dirty: {{grapeCtrl.dirty}}</code><br>
+    <code>grape.value: {{grapeCtrl.value}}</code><br>
     <code>kiwiValue: {{kiwiValue}}</code><br>
     <code>strawberryValue: {{strawberryValue}}</code><br>
   </p>