From 5c93cee6d286fa77217d643711279bc9dcb3fbc6 Mon Sep 17 00:00:00 2001 From: Tom Kirkpatrick Date: Wed, 19 Sep 2018 16:41:05 +0200 Subject: [PATCH] test(timeout): use jest.setTimeout to set timeout --- test/e2e/e2e.spec.js | 3 +-- ...ntl-enzyme-test-helper.js.js => intl-enzyme-test-helper.js} | 0 test/unit/components/Form/Pay.spec.js | 2 +- test/unit/components/Form/Request.spec.js | 2 +- test/unit/components/LoadingBolt.spec.js | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) rename test/unit/__helpers__/{intl-enzyme-test-helper.js.js => intl-enzyme-test-helper.js} (100%) diff --git a/test/e2e/e2e.spec.js b/test/e2e/e2e.spec.js index 7d7a056b..5ff01a30 100644 --- a/test/e2e/e2e.spec.js +++ b/test/e2e/e2e.spec.js @@ -2,10 +2,9 @@ import { Application } from 'spectron' import electronPath from 'electron' import path from 'path' +jest.setTimeout(10000) jest.unmock('electron') -jasmine.DEFAULT_TIMEOUT_INTERVAL = 15000 - describe('main window', function spec() { beforeEach(() => { this.app = new Application({ diff --git a/test/unit/__helpers__/intl-enzyme-test-helper.js.js b/test/unit/__helpers__/intl-enzyme-test-helper.js similarity index 100% rename from test/unit/__helpers__/intl-enzyme-test-helper.js.js rename to test/unit/__helpers__/intl-enzyme-test-helper.js diff --git a/test/unit/components/Form/Pay.spec.js b/test/unit/components/Form/Pay.spec.js index 45f3e0fc..8afeab72 100644 --- a/test/unit/components/Form/Pay.spec.js +++ b/test/unit/components/Form/Pay.spec.js @@ -4,7 +4,7 @@ import Adapter from 'enzyme-adapter-react-16' import Pay from 'components/Form/Pay' -import { mountWithIntl } from '../../__helpers__/intl-enzyme-test-helper.js' +import { mountWithIntl } from '../../__helpers__/intl-enzyme-test-helper' configure({ adapter: new Adapter() }) diff --git a/test/unit/components/Form/Request.spec.js b/test/unit/components/Form/Request.spec.js index bc98c7fb..0e1a2fd2 100644 --- a/test/unit/components/Form/Request.spec.js +++ b/test/unit/components/Form/Request.spec.js @@ -4,7 +4,7 @@ import Adapter from 'enzyme-adapter-react-16' import Request from 'components/Form/Request' -import { mountWithIntl } from '../../__helpers__/intl-enzyme-test-helper.js' +import { mountWithIntl } from '../../__helpers__/intl-enzyme-test-helper' configure({ adapter: new Adapter() }) diff --git a/test/unit/components/LoadingBolt.spec.js b/test/unit/components/LoadingBolt.spec.js index 1d2fc2d6..ad9f3fee 100644 --- a/test/unit/components/LoadingBolt.spec.js +++ b/test/unit/components/LoadingBolt.spec.js @@ -6,7 +6,7 @@ import Isvg from 'react-inlinesvg' import LoadingBolt from 'components/LoadingBolt' import cloudboltIcon from 'icons/cloudbolt.svg' -import { mountWithIntl } from '../__helpers__/intl-enzyme-test-helper.js' +import { mountWithIntl } from '../__helpers__/intl-enzyme-test-helper' configure({ adapter: new Adapter() })