Update other test tasks to use karma-browserify

diff --git a/gulpfile.js b/gulpfile.js
index d0f9d08b9a9a72ad9e601e23fbe639ed577dae90..5b64a19203243447f6f5bf5fca7896349aaf6b63 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -133,7 +133,7 @@ function validHTMLTask() {
 
 
 function unittestTask() {
-  var files = ['./dist/Chart.bundle.js']
+  var files = ['./src/**/*.js'];
   Array.prototype.unshift.apply(files, preTestFiles);
   Array.prototype.push.apply(files, testFiles);
 
@@ -145,7 +145,7 @@ function unittestTask() {
 }
 
 function unittestWatchTask() {
-  var files = ['./dist/Chart.bundle.js']
+  var files = ['./src/**/*.js'];
   Array.prototype.unshift.apply(files, preTestFiles);
   Array.prototype.push.apply(files, testFiles);
 
@@ -157,7 +157,6 @@ function unittestWatchTask() {
 }
 
 function coverageTask() {
-  //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.conf.ci.js b/karma.conf.ci.js
index d6ee47bf2c9085333fe45f95daecae23689a394e..7ed5d0fe2c9a8edb69dda681acfc26c865386186 100644 (file)
--- a/karma.conf.ci.js
+++ b/karma.conf.ci.js
@@ -7,8 +7,14 @@ module.exports = function(config) {
                                flags: ['--no-sandbox']
                        }
                },
-               frameworks: ['jasmine'],
+               frameworks: ['browserify', 'jasmine'],
                reporters: ['progress', 'html'],
+               preprocessors: {
+                       'src/**/*.js': ['browserify']
+               },
+               browserify: {
+                       debug: true
+               }
        };
 
        if (process.env.TRAVIS) {

diff --git a/karma.conf.js b/karma.conf.js
index bce079624ae26c1731a44c8533332924e35bf5e2..acdff3f9cad2cc5d8d3dbd09c6e2e97a4e2b12b2 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,7 +1,14 @@
 module.exports = function(config) {
        config.set({
                browsers: ['Chrome', 'Firefox'],
-               frameworks: ['jasmine'],
+               frameworks: ['browserify', 'jasmine'],
                reporters: ['progress', 'html'],
+
+               preprocessors: {
+                       'src/**/*.js': ['browserify']
+               },
+               browserify: {
+                       debug: true
+               }
        });
 };
\ No newline at end of file