diff --git a/karma-common.js b/karma-common.js index 03365b2ad7..1e2bb2481c 100644 --- a/karma-common.js +++ b/karma-common.js @@ -1,7 +1,7 @@ var browsers = require('./browsers.json'); var MINUTE_IN_MS = 1000 * 60 -var MAX_TIMEOUT = MINUTE_IN_MS * 5 +var MAX_TIMEOUT = 2 * MINUTE_IN_MS module.exports = { basePath: "", diff --git a/package.json b/package.json index 496736b035..e1f478639c 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "grunt-regex-replace": "~0.2.5", "grunt-s3": "git://github.com/pifantastic/grunt-s3", "gruntify-eslint": "^1.3.0", - "karma": "^1.3.0", + "karma": "1.3.0", "karma-coverage": "^1.1.1", "karma-coveralls": "^1.1.2", "karma-mocha-ie-legacy": "file:./test/karma-mocha",