From 7e74cc3249ba1a29fd4e1f7ccf0ad484f2aba279 Mon Sep 17 00:00:00 2001
From: Magnus Bellstrand <bellstrand@gmail.com>
Date: Mon, 20 Jun 2016 21:32:34 +0200
Subject: [PATCH] ES6 coverage, updated karma and jasmine dependencies

---
 skeleton-esnext/build/tasks/test.js | 11 -----------
 skeleton-esnext/karma.conf.js       |  3 ++-
 skeleton-esnext/package.json        | 11 +++++------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/skeleton-esnext/build/tasks/test.js b/skeleton-esnext/build/tasks/test.js
index 4e3f6a5de..4335cf22d 100644
--- a/skeleton-esnext/build/tasks/test.js
+++ b/skeleton-esnext/build/tasks/test.js
@@ -28,18 +28,7 @@ gulp.task('cover', function(done) {
     configFile: __dirname + '/../../karma.conf.js',
     singleRun: true,
     reporters: ['coverage'],
-    preprocessors: {
-      'test/**/*.js': ['babel'],
-      'src/**/*.js': ['babel', 'coverage']
-    },
     coverageReporter: {
-      includeAllSources: true,
-      instrumenters: {
-        isparta: require('isparta')
-      },
-      instrumenter: {
-        'src/**/*.js': 'isparta'
-      },
       reporters: [
         { type: 'html', dir: 'coverage' },
         { type: 'text' }
diff --git a/skeleton-esnext/karma.conf.js b/skeleton-esnext/karma.conf.js
index 7578cb0ae..b2a3d7d90 100644
--- a/skeleton-esnext/karma.conf.js
+++ b/skeleton-esnext/karma.conf.js
@@ -43,7 +43,8 @@ module.exports = function(config) {
         plugins: [
           'syntax-flow',
           'transform-decorators-legacy',
-          'transform-flow-strip-types'
+          'transform-flow-strip-types',
+          [ '__coverage__', { 'ignore': 'test/' } ]
         ]
       }
     },
diff --git a/skeleton-esnext/package.json b/skeleton-esnext/package.json
index f9189a9ee..3171c87cb 100644
--- a/skeleton-esnext/package.json
+++ b/skeleton-esnext/package.json
@@ -27,6 +27,7 @@
     "aurelia-tools": "^0.1.18",
     "babel-core": "^6.7.2",
     "babel-eslint": "^5.0.0",
+    "babel-plugin-__coverage__": "^11.0.0",
     "babel-plugin-syntax-flow": "^6.5.0",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-es2015-modules-amd": "^6.6.5",
@@ -48,16 +49,14 @@
     "gulp-plumber": "^1.0.1",
     "gulp-protractor": "1.0.0",
     "gulp-sourcemaps": "^1.3.0",
-    "isparta": "^3.1.0",
-    "istanbul": "^0.3.13",
-    "jasmine-core": "^2.1.3",
+    "jasmine-core": "^2.4.1",
     "jspm": "0.16.15",
     "karma": "^0.13.15",
     "karma-babel-preprocessor": "^6.0.1",
     "karma-chrome-launcher": "^0.2.1",
-    "karma-coverage": "^0.5.3",
-    "karma-jasmine": "^0.3.5",
-    "karma-jspm": "2.0.1-beta.2",
+    "karma-coverage": "^0.5.5",
+    "karma-jasmine": "^1.0.2",
+    "karma-jspm": "^2.1.1",
     "object.assign": "^1.0.3",
     "require-dir": "^0.1.0",
     "run-sequence": "^1.0.2",