Fixed karma running tests twice in parallel (causing mush trouble)
This commit is contained in:
parent
0df8eabe08
commit
968c22c59f
|
@ -4,12 +4,13 @@ module.exports = function (config) {
|
||||||
basePath: '',
|
basePath: '',
|
||||||
frameworks: ['jasmine'],
|
frameworks: ['jasmine'],
|
||||||
files: [
|
files: [
|
||||||
'src/vendor/jasmine/lib/jasmine-core/jasmine.js',
|
|
||||||
'src/vendor/jasmine/lib/jasmine-core/jasmine-html.js',
|
|
||||||
'src/vendor/jasmine/lib/jasmine-core/boot.js',
|
|
||||||
'src/vendor/phaser-official/build/phaser.js',
|
'src/vendor/phaser-official/build/phaser.js',
|
||||||
'build/main.js'
|
'build/main.js'
|
||||||
],
|
],
|
||||||
|
client: {
|
||||||
|
captureConsole: false
|
||||||
|
},
|
||||||
|
logLevel: config.LOG_WARN,
|
||||||
browsers: ['PhantomJS'],
|
browsers: ['PhantomJS'],
|
||||||
singleRun: true,
|
singleRun: true,
|
||||||
reporters: ['progress', 'coverage'],
|
reporters: ['progress', 'coverage'],
|
||||||
|
|
|
@ -24,10 +24,11 @@ module SpaceTac.View.Specs {
|
||||||
};
|
};
|
||||||
|
|
||||||
game.state.add("test", state);
|
game.state.add("test", state);
|
||||||
stateargs.unshift(true);
|
var args = stateargs.slice(0);
|
||||||
stateargs.unshift(true);
|
args.unshift(true);
|
||||||
stateargs.unshift("test");
|
args.unshift(true);
|
||||||
game.state.start.apply(game.state, stateargs);
|
args.unshift("test");
|
||||||
|
game.state.start.apply(game.state, args);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue