Skip to content

fix(app): increase mocha default timeout to 5000 #1176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2015
Merged

fix(app): increase mocha default timeout to 5000 #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/templates/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,8 @@ module.exports = function (grunt) {
mochaTest: {
options: {
reporter: 'spec',
require: 'mocha.conf.js'
require: 'mocha.conf.js',
timeout: 5000 // set default mocha spec timeout
},
unit: {
src: ['server/**/*.spec.js']
Expand Down
8 changes: 7 additions & 1 deletion app/templates/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ module.exports = function(config) {

// testing framework to use (jasmine/mocha/qunit/...)<% if (filters.jasmine) { %>
frameworks: ['jasmine'],<% } if (filters.mocha) { %>
frameworks: ['mocha', 'chai', 'sinon-chai', 'chai-as-promised', 'chai-things'],<% } %>
frameworks: ['mocha', 'chai', 'sinon-chai', 'chai-as-promised', 'chai-things'],

client: {
mocha: {
timeout: 5000 // set default mocha spec timeout
}
},<% } %>

// list of files / patterns to load in the browser
files: [
Expand Down