Update other test tasks to use karma-browserify

sahifedp · Feb 14, 2016 · a84f9d9 · a84f9d9
1 parent 96551c2
commit a84f9d9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
+		}
 	});
 };