feat: reduce timeout and monkeypatch this.timeout

README.md

@@ -32,6 +32,9 @@ As we are no longer using `gulp` the previous setup using a custom `gulpfile` wi
 
 `aegir` is now a single binary with subcommands. While something like `aegir-test` still works, we recommend to switch to the new `aegir test` syntax.
 
+### Switch from Mocha to Jest
+
+Because the mocha binary was the source of many pains tests in node are now run using [Jest](https://facebook.github.io/jest/). All important features should work as before, but if you were relying on a mocha specific feature it might break now.
 
 ## Project Structure
 

src/config/custom.js

@@ -1,5 +1,5 @@
 'use strict'
 
 module.exports = {
-  timeout: 40 * 1000
+  timeout: 5 * 1000
 }

src/config/jest-setup.js

@@ -9,3 +9,29 @@ global.before = beforeAll
 global.after = afterAll
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = custom.timeout
+
+function timeout (duration) {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = duration
+}
+
+(function patchJasmine (jasmine) {
+  jasmine.Suite.prototype.timeout = timeout
+
+  const original = jasmine.Spec
+  jasmine.Spec = function Spec (attr) {
+    original.call(this, attr)
+
+    const originalUserContext = this.userContext
+    this.userContext = () => {
+      const ctx = originalUserContext.call(this)
+      ctx.timeout = timeout
+      return ctx
+    }
+  }
+  jasmine.Spec.prototype = original.prototype
+  for (const statics in original) {
+    if (Object.prototype.hasOwnProperty.call(original, statics)) {
+      jasmine.Spec[statics] = original[statics]
+    }
+  }
+})(global.jasmine)

src/test/node.js

@@ -6,7 +6,8 @@ const path = require('path')
 function testNode (ctx) {
   const args = [
     '--colors',
-    '--config', require.resolve('../config/jest')
+    '--config', require.resolve('../config/jest'),
+    '--env', 'node'
   ]
 
   let files = [

test/test.spec.js

@@ -0,0 +1,16 @@
+/* eslint-env jest */
+'use strict'
+
+describe('test', () => {
+  describe('node', () => {
+    it('patches this.timeout', function (done) {
+      this.timeout(6 * 1000)
+      setTimeout(done, 5500)
+    })
+
+    it('adds aliases for before and after', () => {
+      expect(global.before).toEqual(beforeAll)
+      expect(global.after).toEqual(afterAll)
+    })
+  })
+})

test/utils.spec.js

@@ -5,7 +5,7 @@ const sinon = require('sinon')
 
 const utils = require('../src/utils')
 
-describe('utils', () => {
+describe('utils', function () {
   it('getBasePath', () => {
     expect(utils.getBasePath()).toEqual(process.cwd())
   })