Skip to content

Commit ba157bb

Browse files
committed
Merge pull request #1176 from kingcody/fix/increase-test-timeouts
fix(app): increase mocha default timeout to 5000
2 parents a9bdcb9 + 4b3b53d commit ba157bb

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

app/templates/Gruntfile.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@ module.exports = function (grunt) {
472472
mochaTest: {
473473
options: {
474474
reporter: 'spec',
475-
require: 'mocha.conf.js'
475+
require: 'mocha.conf.js',
476+
timeout: 5000 // set default mocha spec timeout
476477
},
477478
unit: {
478479
src: ['server/**/*.spec.js']

app/templates/karma.conf.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ module.exports = function(config) {
88

99
// testing framework to use (jasmine/mocha/qunit/...)<% if (filters.jasmine) { %>
1010
frameworks: ['jasmine'],<% } if (filters.mocha) { %>
11-
frameworks: ['mocha', 'chai', 'sinon-chai', 'chai-as-promised', 'chai-things'],<% } %>
11+
frameworks: ['mocha', 'chai', 'sinon-chai', 'chai-as-promised', 'chai-things'],
12+
13+
client: {
14+
mocha: {
15+
timeout: 5000 // set default mocha spec timeout
16+
}
17+
},<% } %>
1218

1319
// list of files / patterns to load in the browser
1420
files: [

0 commit comments

Comments
 (0)