summaryrefslogtreecommitdiffhomepage
path: root/gui/test/setup
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2019-04-24 13:43:31 +0200
committerAndrej Mihajlov <and@mullvad.net>2019-04-25 09:39:03 +0200
commit5d64426d40f87fb90db3550f51d83d63b53b0f65 (patch)
tree23a28cdc862fa1af42caac9686780d883a0a75a4 /gui/test/setup
parentd07d62e752f55718dad05218504c208ea4c354bc (diff)
downloadmullvadvpn-5d64426d40f87fb90db3550f51d83d63b53b0f65.tar.xz
mullvadvpn-5d64426d40f87fb90db3550f51d83d63b53b0f65.zip
Update electron-log
Diffstat (limited to 'gui/test/setup')
-rw-r--r--gui/test/setup/main.js1
-rw-r--r--gui/test/setup/renderer.ts5
2 files changed, 6 insertions, 0 deletions
diff --git a/gui/test/setup/main.js b/gui/test/setup/main.js
index dd458a30b6..3d2a20c020 100644
--- a/gui/test/setup/main.js
+++ b/gui/test/setup/main.js
@@ -2,3 +2,4 @@ const log = require('electron-log');
log.transports.console.level = false;
log.transports.file.level = false;
+log.transports.rendererConsole = null;
diff --git a/gui/test/setup/renderer.ts b/gui/test/setup/renderer.ts
index 05c236a2da..d3de21979d 100644
--- a/gui/test/setup/renderer.ts
+++ b/gui/test/setup/renderer.ts
@@ -1,9 +1,14 @@
+import log from 'electron-log';
import Enzyme from 'enzyme';
import ReactSixteenAdapter from 'enzyme-adapter-react-16';
import chai from 'chai';
import spies from 'chai-spies';
import chaiAsPromised from 'chai-as-promised';
+log.transports.console.level = false;
+log.transports.file.level = false;
+log.transports.mainConsole = null;
+
chai.use(spies);
chai.use(chaiAsPromised);