From 489fbb32f22b026fca8245dc8bbd0ac3d7e16418 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Sun, 9 Jul 2017 12:18:32 +0200 Subject: [PATCH] feat: reduce default timeout to 40s and enable it in node tests --- src/config/custom.js | 2 +- src/config/jest-setup.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/config/custom.js b/src/config/custom.js index cd5fa84fa..76fa0b5ff 100644 --- a/src/config/custom.js +++ b/src/config/custom.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { - timeout: 80 * 1000 + timeout: 40 * 1000 } diff --git a/src/config/jest-setup.js b/src/config/jest-setup.js index f08f06dc1..0561858f7 100644 --- a/src/config/jest-setup.js +++ b/src/config/jest-setup.js @@ -1,6 +1,11 @@ /* eslint-env jest */ +/* 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