Merge pull request #35 from driftyco/pr/26

Pr/26

Author: leifwells

ionic.config.json

@@ -1,7 +1,5 @@
 {
   "name": "ionic-unit-testing-example",
   "app_id": "",
-  "projectTypeId": "ionic-angular",
-  "v2": true,
-  "typescript": true
+  "type": "ionic-angular"
 }

package.json

@@ -13,35 +13,33 @@
     "e2e": "webdriver-manager update --standalone false --gecko false; protractor ./test-config/protractor.conf.js"
   },
   "dependencies": {
-    "@angular/common": "2.4.8",
-    "@angular/compiler": "2.4.8",
-    "@angular/compiler-cli": "2.4.8",
-    "@angular/core": "2.4.8",
-    "@angular/forms": "2.4.8",
-    "@angular/http": "2.4.8",
-    "@angular/platform-browser": "2.4.8",
-    "@angular/platform-browser-dynamic": "2.4.8",
-    "@angular/platform-server": "2.4.8",
-    "@ionic-native/core": "3.1.0",
-    "@ionic-native/splash-screen": "3.1.0",
-    "@ionic-native/status-bar": "3.1.0",
-    "@ionic/storage": "2.0.0",
-    "ionic-angular": "2.2.0",
+    "@angular/common": "4.1.0",
+    "@angular/compiler": "4.1.0",
+    "@angular/compiler-cli": "4.1.0",
+    "@angular/core": "4.1.0",
+    "@angular/forms": "4.1.0",
+    "@angular/http": "4.1.0",
+    "@angular/platform-browser": "4.1.0",
+    "@angular/platform-browser-dynamic": "4.1.0",
+    "@ionic-native/core": "3.7.0",
+    "@ionic-native/splash-screen": "3.7.0",
+    "@ionic-native/status-bar": "3.7.0",
+    "@ionic/storage": "2.0.1",
+    "ionic-angular": "3.2.1",
     "ionicons": "3.0.0",
-    "rxjs": "5.0.1",
+    "rxjs": "5.1.1",
     "sw-toolbox": "3.4.0",
-    "zone.js": "0.7.2"
+    "zone.js": "^0.8.10"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "1.1.4",
-    "@ionic/cli-build-ionic-angular": "0.0.3",
-    "@ionic/cli-plugin-cordova": "0.0.9",
+    "@ionic/app-scripts": "1.3.7",
+    "@ionic/cli-plugin-ionic-angular": "1.0.0",
     "@types/jasmine": "^2.5.41",
     "@types/node": "^7.0.8",
     "angular2-template-loader": "^0.6.2",
     "html-loader": "^0.4.5",
     "jasmine": "^2.5.3",
-    "jasmine-spec-reporter": "^3.2.0",
+    "jasmine-spec-reporter": "^4.1.0",
     "karma": "^1.5.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-jasmine": "^1.1.0",
@@ -52,7 +50,7 @@
     "protractor": "^5.1.1",
     "ts-loader": "^2.0.3",
     "ts-node": "^3.0.2",
-    "typescript": "2.1.6"
+    "typescript": "2.2.1"
   },
   "version": "0.0.1",
   "description": "An Ionic project"

src/app/app.component.spec.ts

@@ -30,11 +30,11 @@ describe('MyApp Component', () => {
     component = fixture.componentInstance;
   });
 
-  it ('should be created', () => {
+  it('should be created', () => {
     expect(component instanceof MyApp).toBe(true);
   });
 
-  it ('should have two pages', () => {
+  it('should have two pages', () => {
     expect(component.pages.length).toBe(2);
   });
 

src/app/app.component.ts

@@ -15,7 +15,7 @@ export class MyApp {
 
   rootPage: any = Page1;
 
-  pages: Array<{title: string, component: any}>;
+  pages: Array<{ title: string, component: any }>;
 
   constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen) {
     this.initializeApp();

src/app/app.module.ts

@@ -1,4 +1,5 @@
 import { NgModule, ErrorHandler } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
 import { MyApp } from './app.component';
 
@@ -15,7 +16,8 @@ import { SplashScreen } from '@ionic-native/splash-screen';
     Page2
   ],
   imports: [
-    IonicModule.forRoot(MyApp)
+    BrowserModule,
+    IonicModule.forRoot(MyApp, {}, { links: [] })
   ],
   bootstrap: [IonicApp],
   entryComponents: [
@@ -26,7 +28,7 @@ import { SplashScreen } from '@ionic-native/splash-screen';
   providers: [
     StatusBar,
     SplashScreen,
-    {provide: ErrorHandler, useClass: IonicErrorHandler}
+    { provide: ErrorHandler, useClass: IonicErrorHandler }
   ]
 })
-export class AppModule {}
+export class AppModule { }

src/pages/page1/page1.spec.ts

@@ -5,14 +5,14 @@ import { Page1 } from './page1';
 import { IonicModule, Platform, NavController } from 'ionic-angular/index';
 import { PlatformMock } from '../../../test-config/mocks-ionic';
 
-describe('Page1', function () {
+describe('Page1', function() {
   let de: DebugElement;
   let comp: Page1;
   let fixture: ComponentFixture<Page1>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ Page1 ],
+      declarations: [Page1],
       imports: [
         IonicModule.forRoot(Page1)
       ],
@@ -29,7 +29,7 @@ describe('Page1', function () {
     de = fixture.debugElement.query(By.css('h3'));
   });
 
-  it('should create component', () => expect(comp).toBeDefined() );
+  it('should create component', () => expect(comp).toBeDefined());
 
   it('should have expected <h3> text', () => {
     fixture.detectChanges();

src/pages/page1/page1.ts

@@ -9,7 +9,7 @@ import { NavController } from 'ionic-angular';
 export class Page1 {
 
   constructor(public navCtrl: NavController) {
-    
+
   }
 
 }

src/pages/page2/page2.html

@@ -10,9 +10,9 @@
 <ion-content>
   <ion-list>
     <button ion-item *ngFor="let item of items" (click)="itemTapped($event, item)">
-      <ion-icon [name]="item.icon" item-left></ion-icon>
+      <ion-icon [name]="item.icon" item-start></ion-icon>
       {{item.title}}
-      <div class="item-note" item-right>
+      <div class="item-note" item-end>
         {{item.note}}
       </div>
     </button>

src/pages/page2/page2.ts

@@ -9,15 +9,15 @@ import { NavController, NavParams } from 'ionic-angular';
 export class Page2 {
   selectedItem: any;
   icons: string[];
-  items: Array<{title: string, note: string, icon: string}>;
+  items: Array<{ title: string, note: string, icon: string }>;
 
   constructor(public navCtrl: NavController, public navParams: NavParams) {
     // If we navigated to this page, we will have an item available as a nav param
     this.selectedItem = navParams.get('item');
 
     // Let's populate this page with some filler content for funzies
     this.icons = ['flask', 'wifi', 'beer', 'football', 'basketball', 'paper-plane',
-    'american-football', 'boat', 'bluetooth', 'build'];
+      'american-football', 'boat', 'bluetooth', 'build'];
 
     this.items = [];
     for (let i = 1; i < 11; i++) {

test-config/karma-test-shim.js

@@ -18,4 +18,4 @@ appContext.keys().forEach(appContext);
 var testing = require('@angular/core/testing');
 var browser = require('@angular/platform-browser-dynamic/testing');
 
-testing.TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());
+testing.TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());