begin fixing coverage tests

diff --git a/gulpfile.js b/gulpfile.js
index 7b2710983b7d44839a316ec19c345fa71e67ed4f..d0f9d08b9a9a72ad9e601e23fbe639ed577dae90 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -157,7 +157,8 @@ function unittestWatchTask() {
 }
 
 function coverageTask() {
-  var files = ['./dist/Chart.bundle.js']
+  //var files = ['./dist/Chart.bundle.js']
+  var files = ['./src/**/*.js'];
   Array.prototype.unshift.apply(files, preTestFiles);
   Array.prototype.push.apply(files, testFiles);
 

diff --git a/karma.coverage.conf.js b/karma.coverage.conf.js
index cc047aa4d03ce37f8f6c8460221610a1fe12da12..056b7e655587912a664d27c5faf56b02c5a1faf6 100644 (file)
--- a/karma.coverage.conf.js
+++ b/karma.coverage.conf.js
@@ -7,10 +7,14 @@ module.exports = function(config) {
                        dir: 'coverage/'
                },
 
-               frameworks: ['jasmine'],
+               frameworks: ['browserify', 'jasmine'],
 
                preprocessors: {
-                       'src/**/*.js': ['coverage']
+                       'src/**/*.js': ['browserify', 'coverage']
+               },
+               browserify: {
+                       debug: true,
+                       transform: ['browserify-istanbul']
                },
                
                reporters: ['progress', 'coverage'],

diff --git a/package.json b/package.json
index 3f3602dcfa532840cd73bf4a80b058874c0c3bb0..05b86f665e0d43c5e553139ecd255c30e8a9cf4c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   },
   "devDependencies": {
     "browserify": "^13.0.0",
+    "browserify-istanbul": "^0.2.1",
     "gulp": "3.9.x",
     "gulp-concat": "~2.1.x",
     "gulp-connect": "~2.0.5",
@@ -26,7 +27,9 @@
     "jasmine": "^2.3.2",
     "jasmine-core": "^2.3.4",
     "jquery": "^2.1.4",
+    "jshint-stylish": "~2.1.0",
     "karma": "^0.12.37",
+    "karma-browserify": "^5.0.1",
     "karma-chrome-launcher": "^0.2.0",
     "karma-coverage": "^0.5.1",
     "karma-firefox-launcher": "^0.1.6",
@@ -34,8 +37,7 @@
     "karma-jasmine-html-reporter": "^0.1.8",
     "merge-stream": "^1.0.0",
     "semver": "^3.0.1",
-    "vinyl-source-stream": "^1.1.0",
-    "jshint-stylish": "~2.1.0"
+    "vinyl-source-stream": "^1.1.0"
   },
   "spm": {
     "main": "Chart.js"