diff --git a/Gruntfile.js b/Gruntfile.js index 8f53bd3..81dd7d7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -104,6 +104,7 @@ files: { srcBlob: '<%= dirs.src %>/**/*.js', testBlob: '<%= dirs.test %>/{functional,lib/pixi,unit/pixi}/**/*.js', + testConf: '<%= dirs.test %>/karma.conf.js', build: '<%= dirs.build %>/pixi.dev.js', buildMin: '<%= dirs.build %>/pixi.js' }, @@ -133,7 +134,10 @@ }, source: srcFiles.filter(function(v) { return v.match(/(Intro|Outro|Spine|Pixi)\.js$/) === null; }).concat('Gruntfile.js'), test: { - src: ['<%= files.testBlob %>'], + src: [ + '<%= files.testBlob %>', + '<%= files.testConf %>' + ], options: { jshintrc: undefined, //don't use jshintrc for tests expr: true, @@ -184,7 +188,7 @@ }, karma: { unit: { - configFile: 'test/karma.conf.js', + configFile: '<%= files.testConf %>', // browsers: ['Chrome'], singleRun: true }