diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-02-04 16:50:23 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-02-04 16:50:23 +0100 |
| commit | 54142b0fa0b26a33d8e6181a61e03b4b46abda00 (patch) | |
| tree | 743b3c7bb19ba93730d329441ddeee51de5174b1 /gui/packages/components/test | |
| parent | f97c5621fad66ae9768dad8cc422bc3a61f76ef6 (diff) | |
| parent | 612952ba1d3a277863d0d35c5285890698939d1d (diff) | |
| download | mullvadvpn-54142b0fa0b26a33d8e6181a61e03b4b46abda00.tar.xz mullvadvpn-54142b0fa0b26a33d8e6181a61e03b4b46abda00.zip | |
Merge branch 'typescript'
Diffstat (limited to 'gui/packages/components/test')
| -rw-r--r-- | gui/packages/components/test/.eslintrc | 12 | ||||
| -rw-r--r-- | gui/packages/components/test/setup.ts | 8 |
2 files changed, 4 insertions, 16 deletions
diff --git a/gui/packages/components/test/.eslintrc b/gui/packages/components/test/.eslintrc deleted file mode 100644 index fc2ab4d496..0000000000 --- a/gui/packages/components/test/.eslintrc +++ /dev/null @@ -1,12 +0,0 @@ -{ - "rules": { - "no-unused-expressions" : "off", - "react/no-render-return-value": "off" - }, - "env": { - "mocha": true - }, - "globals": { - "expect": true - } -} diff --git a/gui/packages/components/test/setup.ts b/gui/packages/components/test/setup.ts index fdcc4e49d8..30495cbc89 100644 --- a/gui/packages/components/test/setup.ts +++ b/gui/packages/components/test/setup.ts @@ -1,10 +1,10 @@ import { JSDOM } from 'jsdom'; -import * as Enzyme from 'enzyme'; -import * as Adapter from 'enzyme-adapter-react-16'; -import * as chai from 'chai'; +import Enzyme from 'enzyme'; +import ReactSixteenAdapter from 'enzyme-adapter-react-16'; Enzyme.configure({ - adapter: new Adapter(), + adapter: new ReactSixteenAdapter(), }); +// @ts-ignore const jsdom = new JSDOM('<!doctype html><html><body></body></html>'); |