summaryrefslogtreecommitdiffhomepage
path: root/gui/test/setup
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2019-04-01 16:00:22 +0200
committerAndrej Mihajlov <and@mullvad.net>2019-04-01 16:00:22 +0200
commit33c7666cc6d03b393b4e003c04c4ca1d3a4ff5cc (patch)
tree6a155396bedff004b0f733ad7fc304b8cc215336 /gui/test/setup
parentbcf731749bddebb2eb25ccc6a5b83b45de8fdb0e (diff)
parentc54a8e8af8ed5e53151ded7f66d9eea7cf7a5d20 (diff)
downloadmullvadvpn-33c7666cc6d03b393b4e003c04c4ca1d3a4ff5cc.tar.xz
mullvadvpn-33c7666cc6d03b393b4e003c04c4ca1d3a4ff5cc.zip
Merge branch 'fix-typescript-tests'
Diffstat (limited to 'gui/test/setup')
-rw-r--r--gui/test/setup/main.js (renamed from gui/test/setup/main.ts)2
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/test/setup/main.ts b/gui/test/setup/main.js
index 9b6ecc5ef7..dd458a30b6 100644
--- a/gui/test/setup/main.ts
+++ b/gui/test/setup/main.js
@@ -1,4 +1,4 @@
-import log from 'electron-log';
+const log = require('electron-log');
log.transports.console.level = false;
log.transports.file.level = false;