From 968c22c59f5c063dd4e70709631c2e77decdb927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Wed, 14 Jan 2015 01:00:00 +0100 Subject: [PATCH] Fixed karma running tests twice in parallel (causing mush trouble) --- karma.conf.js | 7 ++++--- src/scripts/view/specs/TestGame.ts | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 92b7a5d..eb524eb 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -4,12 +4,13 @@ module.exports = function (config) { basePath: '', frameworks: ['jasmine'], 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', 'build/main.js' ], + client: { + captureConsole: false + }, + logLevel: config.LOG_WARN, browsers: ['PhantomJS'], singleRun: true, reporters: ['progress', 'coverage'], diff --git a/src/scripts/view/specs/TestGame.ts b/src/scripts/view/specs/TestGame.ts index 5a7b405..9caa373 100644 --- a/src/scripts/view/specs/TestGame.ts +++ b/src/scripts/view/specs/TestGame.ts @@ -24,10 +24,11 @@ module SpaceTac.View.Specs { }; game.state.add("test", state); - stateargs.unshift(true); - stateargs.unshift(true); - stateargs.unshift("test"); - game.state.start.apply(game.state, stateargs); + var args = stateargs.slice(0); + args.unshift(true); + args.unshift(true); + args.unshift("test"); + game.state.start.apply(game.state, args); }); } }