Merge remote-tracking branch 'ionic-team/master'

Author: leifwells

README.md

@@ -7,13 +7,27 @@ Special thanks to all of the contributors. With the exception of the Ionic team'
 
 UPDATES:
 --------
-*2017-05-28: Update to Version 3.3.0*
+### **2017-08-26: Update to `ionic-angular` version 3.6.0**
+
+We updated the project to `ionic-angular` version `3.6.0`. Developers wishing to use this should also update Ionic CLI for a better experience. With today's update, this project is now at version `0.0.5`.
+
+## **Also of note:**
+
+## **Added: Fix for assets not being found by Karma**
+
+Thanks to [@datencia](https://github.com/datencia) for providing an update to our Karma configuration that properly sets the Karma base path so that image assets can be found during testing. This fix should also work any JSON data files you might want to use for testing. He also provided an image and updated our sample unit test spec file that tests that the image is found. 
+
+## **Added: Update code to match Ionic templates**
+
+Thanks (again) to [@danielsogl](https://github.com/danielsogl/) for providing a code update to the project so that our code matches code created by using the `ionic start` command. Having this code properly match is important as it provides the best practice guidance for handling application start up.
+
+### *2017-05-28: Update to Version 3.3.0*
 
 Thanks to [@danielsogl](https://github.com/danielsogl/) for getting us up-to-date with Ionic 3.3.0, Angular 4.1.2 and Ionic Native 3.10.2.
 
 Thanks to [@johnstonbl01](https://github.com/johnstonbl01/) for adding a couple of mocks that prevent us from seeing some unnecessary warning messages.
 
-*2017-05-12: Update to Version 3* 
+### *2017-05-12: Update to Version 3* 
 
 We've updated this repo to use Ionic v3.2.1 and Ionic CLI v3.0.0.
 

ionic.config.json

@@ -1,5 +1,6 @@
 {
   "name": "ionic-unit-testing-example",
   "app_id": "",
-  "type": "ionic-angular"
+  "type": "ionic-angular",
+  "integrations": {}
 }

package.json

@@ -23,19 +23,19 @@
     "@angular/http": "4.1.3",
     "@angular/platform-browser": "4.1.3",
     "@angular/platform-browser-dynamic": "4.1.3",
-    "@ionic-native/core": "3.13.1",
-    "@ionic-native/splash-screen": "3.13.1",
-    "@ionic-native/status-bar": "3.13.1",
+    "@ionic-native/core": "3.12.1",
+    "@ionic-native/splash-screen": "3.12.1",
+    "@ionic-native/status-bar": "3.12.1",
     "@ionic/storage": "2.0.1",
-    "ionic-angular": "3.5.0",
+    "ionic-angular": "3.6.0",
     "ionicons": "3.0.0",
     "rxjs": "5.4.0",
     "sw-toolbox": "3.6.0",
     "zone.js": "0.8.12"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "1.3.12",
-    "@ionic/cli-plugin-ionic-angular": "1.3.1",
+    "@angular/cli": "1.1.2",
+    "@ionic/app-scripts": "2.1.3",
     "@types/jasmine": "^2.5.41",
     "@types/node": "^7.0.8",
     "angular2-template-loader": "^0.6.2",
@@ -52,8 +52,8 @@
     "protractor": "^5.1.1",
     "ts-loader": "^2.0.3",
     "ts-node": "^3.0.2",
-    "typescript": "2.3.3"
+    "typescript": "2.3.4"
   },
-  "version": "0.0.1",
+  "version": "0.0.5",
   "description": "An Ionic project"
 }

src/app/app.component.ts

@@ -18,8 +18,6 @@ export class MyApp {
   pages: Array<{ title: string, component: any }>;
 
   constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen) {
-    this.initializeApp();
-
     // used for an example of ngFor and navigation
     this.pages = [
       { title: 'Page One', component: Page1 },
@@ -28,7 +26,7 @@ export class MyApp {
 
   }
 
-  initializeApp() {
+  ionViewDidLoad() {
     this.platform.ready().then(() => {
       // Okay, so the platform is ready and our plugins are available.
       // Here you can do any higher level native things you might need.

src/index.html

@@ -10,7 +10,7 @@
   <link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico">
   <link rel="manifest" href="manifest.json">
   <meta name="theme-color" content="#4e8ef7">
-  
+
   <!-- cordova.js required for cordova apps -->
   <script src="cordova.js"></script>
 
@@ -19,7 +19,7 @@
     if ('serviceWorker' in navigator) {
       navigator.serviceWorker.register('service-worker.js')
         .then(() => console.log('service worker installed'))
-        .catch(err => console.log('Error', err));
+        .catch(err => console.error('Error', err));
     }
   </script>-->
 
@@ -34,7 +34,11 @@
   <!-- The polyfills js is generated during the build process -->
   <script src="build/polyfills.js"></script>
 
-  <!-- The bundle js is generated during the build process -->
+  <!-- The vendor js is generated during the build process
+       It contains all of the dependencies in node_modules -->
+  <script src="build/vendor.js"></script>
+
+  <!-- The main bundle js is generated during the build process -->
   <script src="build/main.js"></script>
 
 </body>

src/pages/page1/page1.html

@@ -10,6 +10,8 @@
 <ion-content padding>
   <h3>Ionic Menu Starter</h3>
 
+  <img src="assets/icon/favicon.ico" alt="" />
+
   <p>
     If you get lost, the <a href="http://ionicframework.com/docs/v2">docs</a> will show you the way.
   </p>

src/pages/page1/page1.spec.ts

@@ -41,4 +41,10 @@ describe('Page1', () => {
     expect(h3.innerText).toMatch(/ionic/i,
       '<h3> should say something about "Ionic"');
   });
+
+  it('should show the favicon as <img>', () => {
+    fixture.detectChanges();
+    const img: HTMLImageElement = fixture.debugElement.query(By.css('img')).nativeElement;
+    expect(img.src).toContain('assets/icon/favicon.ico');
+  });
 });

test-config/karma.conf.js

@@ -2,17 +2,30 @@ var webpackConfig = require('./webpack.test.js');
 
 module.exports = function(config) {
   var _config = {
-    basePath: '',
+    basePath: '../',
 
     frameworks: ['jasmine'],
 
-    files: [{
-      pattern: './karma-test-shim.js',
-      watched: true
-    }],
+    files: [
+      {
+        pattern: './test-config/karma-test-shim.js',
+        watched: true
+      },
+      {
+        pattern: './src/assets/**/*',
+        watched: false,
+        included: false,
+        served: true,
+        nocache: false
+      }
+    ],
+
+    proxies: {
+      '/assets/': '/base/src/assets/'
+    },
 
     preprocessors: {
-      './karma-test-shim.js': ['webpack', 'sourcemap']
+      './test-config/karma-test-shim.js': ['webpack', 'sourcemap']
     },
 
     webpack: webpackConfig,

typings/cordova-typings.d.ts

@@ -0,0 +1,3 @@
+
+/// <reference path="../.vscode/typings/cordova-ionic/plugins/keyboard.d.ts"/>
+/// <reference path="../.vscode/typings/jquery/jquery.d.ts"/>