summaryrefslogtreecommitdiffhomepage
path: root/test/setup
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-12-20 11:32:55 +0100
committerLinus Färnstrand <linus@mullvad.net>2017-12-20 11:34:21 +0100
commit2aae380b0af018bf0187bb31fb0fedf6a457ebf1 (patch)
treea8ad6ee12956d92e6257bea07dedc44063f3017f /test/setup
parent7b47ddf735af7f3d6065fb6c3ffea6e9ddfd86cb (diff)
parent8b146934260739ae609791a1fb676d48ceb954c0 (diff)
downloadmullvadvpn-2aae380b0af018bf0187bb31fb0fedf6a457ebf1.tar.xz
mullvadvpn-2aae380b0af018bf0187bb31fb0fedf6a457ebf1.zip
Merge backend and frontend repo master branches
Conflicts: .gitignore .travis.yml README.md
Diffstat (limited to 'test/setup')
-rw-r--r--test/setup/enzyme.js4
-rw-r--r--test/setup/main.js4
2 files changed, 8 insertions, 0 deletions
diff --git a/test/setup/enzyme.js b/test/setup/enzyme.js
new file mode 100644
index 0000000000..135148a7c4
--- /dev/null
+++ b/test/setup/enzyme.js
@@ -0,0 +1,4 @@
+const Enzyme = require('enzyme');
+const Adapter = require('enzyme-adapter-react-16');
+
+Enzyme.configure({ adapter: new Adapter() });
diff --git a/test/setup/main.js b/test/setup/main.js
new file mode 100644
index 0000000000..dd458a30b6
--- /dev/null
+++ b/test/setup/main.js
@@ -0,0 +1,4 @@
+const log = require('electron-log');
+
+log.transports.console.level = false;
+log.transports.file.level = false;