use old istanbul-loader

Author: akirasosa

.gitignore

@@ -22,3 +22,5 @@ Thumbs.db
 
 # generated documents
 /doc
+
+coverage

config/karma.conf.js

@@ -5,14 +5,22 @@ module.exports = function (config) {
     frameworks: ['jasmine'],
     exclude: [],
     files: [
-      {pattern: './config/spec-bundle.ts', watched: false},
+      {pattern: './config/spec-bundle.js', watched: false},
     ],
     preprocessors: {
-      './config/spec-bundle.ts': ['webpack', 'sourcemap'],
+      './config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'],
     },
     webpack: testWebpackConfig,
-    webpackMiddleware: { stats: 'errors-only'},
-    reporters: ['mocha'],
+    coverageReporter: {
+      type: 'in-memory'
+    },
+    remapCoverageReporter: {
+      'text-summary': null,
+      json: './coverage/coverage.json',
+      html: './coverage/html'
+    },
+    webpackMiddleware: {stats: 'errors-only'},
+    reporters: ['mocha', 'coverage', 'remap-coverage'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
@@ -27,7 +35,7 @@ module.exports = function (config) {
     singleRun: true,
   };
 
-  if (process.env.TRAVIS){
+  if (process.env.TRAVIS) {
     configuration.browsers = [
       'ChromeTravisCi'
     ];

config/spec-bundle.js

@@ -0,0 +1,62 @@
+/**
+ * @author: @AngularClass
+ */
+
+/*
+ * When testing with webpack and ES6, we have to do some extra
+ * things to get testing to work right. Because we are gonna write tests
+ * in ES6 too, we have to compile those as well. That's handled in
+ * karma.conf.js with the karma-webpack plugin. This is the entry
+ * file for webpack test. Just like webpack will create a bundle.js
+ * file for our client, when we run test, it will compile and bundle them
+ * all here! Crazy huh. So we need to do some setup
+ */
+Error.stackTraceLimit = Infinity;
+
+require('core-js/es6');
+require('core-js/es7/reflect');
+
+// Typescript emit helpers polyfill
+require('ts-helpers');
+
+require('zone.js/dist/zone');
+require('zone.js/dist/long-stack-trace-zone');
+require('zone.js/dist/proxy'); // since zone.js 0.6.15
+require('zone.js/dist/sync-test');
+require('zone.js/dist/jasmine-patch'); // put here since zone.js 0.6.14
+require('zone.js/dist/async-test');
+require('zone.js/dist/fake-async-test');
+
+// RxJS
+require('rxjs/Rx');
+
+var testing = require('@angular/core/testing');
+var browser = require('@angular/platform-browser-dynamic/testing');
+
+testing.TestBed.initTestEnvironment(
+  browser.BrowserDynamicTestingModule,
+  browser.platformBrowserDynamicTesting()
+);
+
+/*
+ * Ok, this is kinda crazy. We can use the context method on
+ * require that webpack created in order to tell webpack
+ * what files we actually want to require or import.
+ * Below, context will be a function/object with file names as keys.
+ * Using that regex we are saying look in ../src then find
+ * any file that ends with spec.ts and get its path. By passing in true
+ * we say do this recursively
+ */
+var testContext = require.context('../src', true, /\.spec\.ts/);
+
+/*
+ * get all the files, for each file, call the context function
+ * that will require the file and load it up here. Context will
+ * loop and require those spec files here
+ */
+function requireAll(requireContext) {
+  return requireContext.keys().map(requireContext);
+}
+
+// requires and returns all modules that match
+var modules = requireAll(testContext);

config/webpack.test.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const helpers = require('./helpers');
 const webpack = require('webpack');
 
@@ -9,6 +10,7 @@ module.exports = {
   devtool: 'inline-source-map',
   resolve: {
     extensions: ['.ts', '.js'],
+    modules: [path.resolve(__dirname, 'src'), 'node_modules'],
     alias: {
       "lodash": "lodash-es",
     },
@@ -32,10 +34,31 @@ module.exports = {
       },
       {
         test: /\.ts$/,
-        loaders: ['awesome-typescript-loader', 'angular2-template-loader']
+        loader: 'awesome-typescript-loader',
+        query: {
+          sourceMap: false,
+          inlineSourceMap: true,
+          module: 'commonjs',
+        },
+      },
+      {
+        test: /\.ts$/,
+        loader: 'angular2-template-loader',
       },
       {test: /\.css$/, loader: 'raw-loader'},
       {test: /\.html$/, loader: 'raw-loader'},
+      {
+        enforce: 'post',
+        test: /\.(js|ts)$/,
+        loader: 'istanbul-instrumenter-loader',
+        include: [
+          helpers.root('src'),
+        ],
+        exclude: [
+          /\.(e2e|spec)\.ts$/,
+          /node_modules/
+        ]
+      },
     ]
   },
   plugins: [

package.json

@@ -65,12 +65,15 @@
     "extract-text-webpack-plugin": "^2.0.0-beta.4",
     "html-webpack-plugin": "^2.24.1",
     "http-proxy": "^1.15.2",
+    "istanbul-instrumenter-loader": "0.2.0",
     "jasmine-core": "^2.5.2",
     "karma": "^1.3.0",
     "karma-chrome-launcher": "^2.0.0",
+    "karma-coverage": "^1.1.1",
     "karma-jasmine": "^1.0.2",
     "karma-mocha-reporter": "^2.0.2",
     "karma-notify-reporter": "^1.0.1",
+    "karma-remap-coverage": "^0.1.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.8.0",
     "raw-loader": "^0.5.1",

src/app/core/services/auth.service.ts

@@ -2,10 +2,11 @@ import {Observable} from "rxjs/Observable";
 import {Subject} from "rxjs/Subject";
 import {Injectable} from "@angular/core";
 import {Response} from "@angular/http";
-import jwtDecode from "jwt-decode";
 import {JsonHttp} from "./";
 import {User} from "../domains";
 
+const jwtDecode = require('jwt-decode');
+
 @Injectable()
 export class AuthService {