Add karma.conf.js to jshint
This commit is contained in:
parent
180eae99a7
commit
6c6e7ca50f
1 changed files with 6 additions and 2 deletions
|
@ -104,6 +104,7 @@ module.exports = function(grunt) {
|
||||||
files: {
|
files: {
|
||||||
srcBlob: '<%= dirs.src %>/**/*.js',
|
srcBlob: '<%= dirs.src %>/**/*.js',
|
||||||
testBlob: '<%= dirs.test %>/{functional,lib/pixi,unit/pixi}/**/*.js',
|
testBlob: '<%= dirs.test %>/{functional,lib/pixi,unit/pixi}/**/*.js',
|
||||||
|
testConf: '<%= dirs.test %>/karma.conf.js',
|
||||||
build: '<%= dirs.build %>/pixi.dev.js',
|
build: '<%= dirs.build %>/pixi.dev.js',
|
||||||
buildMin: '<%= dirs.build %>/pixi.js'
|
buildMin: '<%= dirs.build %>/pixi.js'
|
||||||
},
|
},
|
||||||
|
@ -133,7 +134,10 @@ module.exports = function(grunt) {
|
||||||
},
|
},
|
||||||
source: srcFiles.filter(function(v) { return v.match(/(Intro|Outro|Spine|Pixi)\.js$/) === null; }).concat('Gruntfile.js'),
|
source: srcFiles.filter(function(v) { return v.match(/(Intro|Outro|Spine|Pixi)\.js$/) === null; }).concat('Gruntfile.js'),
|
||||||
test: {
|
test: {
|
||||||
src: ['<%= files.testBlob %>'],
|
src: [
|
||||||
|
'<%= files.testBlob %>',
|
||||||
|
'<%= files.testConf %>'
|
||||||
|
],
|
||||||
options: {
|
options: {
|
||||||
jshintrc: undefined, //don't use jshintrc for tests
|
jshintrc: undefined, //don't use jshintrc for tests
|
||||||
expr: true,
|
expr: true,
|
||||||
|
@ -184,7 +188,7 @@ module.exports = function(grunt) {
|
||||||
},
|
},
|
||||||
karma: {
|
karma: {
|
||||||
unit: {
|
unit: {
|
||||||
configFile: 'test/karma.conf.js',
|
configFile: '<%= files.testConf %>',
|
||||||
// browsers: ['Chrome'],
|
// browsers: ['Chrome'],
|
||||||
singleRun: true
|
singleRun: true
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue