Allow specifying global mocha timeout

practicalmeteor · Aug 16, 2016 · 19c89cd · 19c89cd
1 parent a98d6ab
commit 19c89cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/client.js b/client.js
@@ -4,6 +4,7 @@ import 'mocha/mocha.js';
 // This defines "describe", "it", etc.
 mocha.setup({
   ui: 'bdd',
+  timeout: Meteor.settings.public["MOCHA_TIMEOUT"] || 2000,
 });
 
 export { mocha };
diff --git a/server.js b/server.js
@@ -108,8 +108,12 @@ function setupGlobals(mocha) {
 // can use to ensure they work well with other test driver packages.
 const mochaInstance = new Mocha({
   ui: 'bdd',
-  ignoreLeaks: true
+  ignoreLeaks: true,
+  timeout: process.env.MOCHA_TIMEOUT || 2000
 });
 setupGlobals(mochaInstance);
-
+
+// Pass timeout to client
+Meteor.settings.public["MOCHA_TIMEOUT"] = process.env.MOCHA_TIMEOUT || 2000;
+
 export { mochaInstance, setupGlobals, Mocha };