From: etimberg <evert.timberg@gmail.com>
Date: Sun, 14 Feb 2016 02:58:49 +0000 (-0500)
Subject: Update other test tasks to use karma-browserify
X-Git-Tag: v2.0.0~46^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a84f9d917721f4f06965c88186a37e8200aecce7;p=thirdparty%2FChart.js.git

Update other test tasks to use karma-browserify
---

diff --git a/gulpfile.js b/gulpfile.js
index d0f9d08b9..5b64a1920 100644
--- 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 d6ee47bf2..7ed5d0fe2 100644
--- 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 bce079624..acdff3f9c 100644
--- 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