feat: make parallel and timeout customizable

cmds/coverage.js

@@ -23,6 +23,16 @@ module.exports = {
       describe: 'Custom globs for files to test',
       type: 'array',
       default: []
+    },
+    parallel: {
+      alias: 'p',
+      describe: 'Run tests in parallel (only available in node)',
+      default: true
+    },
+    timeout: {
+      describe: 'The default time a single test has to run',
+      type: 'number',
+      default: 5000
     }
   },
   handler (argv) {

cmds/test.js

@@ -32,6 +32,16 @@ module.exports = {
       describe: 'Custom globs for files to test',
       type: 'array',
       default: []
+    },
+    parallel: {
+      alias: 'p',
+      describe: 'Run tests in parallel (only available in node)',
+      default: true
+    },
+    timeout: {
+      describe: 'The default time a single test has to run',
+      type: 'number',
+      default: 5000
     }
   },
   handler (argv) {

src/config/jest-setup.js

@@ -2,13 +2,11 @@
 /* eslint-env jasmine */
 'use strict'
 
-const custom = require('./custom')
-
 // Setup aliases to keep api consistent with mocha
 global.before = beforeAll
 global.after = afterAll
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = custom.timeout
+jasmine.DEFAULT_TIMEOUT_INTERVAL = global.DEFAULT_TIMEOUT
 
 function timeout (duration) {
   let done = false

src/config/karma.conf.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const webpackConfig = require('./webpack')
-const timeout = require('./custom').timeout
 
 let concurrency = 1
 let reporters = ['mocha-own']
@@ -36,7 +35,6 @@ module.exports = function (config) {
     browsers: browsers,
     singleRun: true,
     concurrency: concurrency,
-    browserNoActivityTimeout: timeout,
     failOnEmptyTestSuite: true
   })
 }

src/test/browser-config.js

@@ -3,7 +3,6 @@
 const path = require('path')
 const _ = require('lodash')
 
-const timeout = require('../config/custom').timeout
 const user = require('../config/user')
 
 const CONFIG_FILE = path.join(__dirname, '..', 'config', 'karma.conf.js')
@@ -24,24 +23,22 @@ function webworkerClient (ctx) {
     mochaWebWorker: {
       pattern: getPatterns(ctx),
       mocha: {
-        timeout: timeout
+        timeout: ctx.timeout
       }
     }
   }
 }
 
-const defaultClient = {
-  mocha: {
-    timeout: timeout
-  }
-}
-
 function getClient (isWebworker, ctx) {
   if (isWebworker) {
     return webworkerClient(ctx)
   }
 
-  return defaultClient
+  return {
+    mocha: {
+      timeout: ctx.timeout
+    }
+  }
 }
 
 function getConfig (isWebworker, ctx) {
@@ -70,7 +67,8 @@ function getConfig (isWebworker, ctx) {
     client: getClient(isWebworker, ctx),
     mochaOwnReporter: {
       reporter: ctx.verbose ? 'spec' : 'progress'
-    }
+    },
+    browserNoActivityTimeout: ctx.timeout
   })
 }
 

src/test/node.js

@@ -9,14 +9,19 @@ function testNode (ctx) {
   const args = [
     '--colors',
     '--config', require.resolve('../config/jest'),
-    '--env', 'node'
+    '--env', 'node',
+    '--globals', JSON.stringify({ DEFAULT_TIMEOUT: ctx.timeout })
   ]
 
   let files = [
     'test/node.js$',
     'test/.*\\.spec\\.js$'
   ]
 
+  if (!ctx.parallel) {
+    args.push('--runInBand')
+  }
+
   if (ctx.verbose) {
     args.push('--verbose')
   }