summaryrefslogtreecommitdiffhomepage
path: root/gui/test
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-01-12 13:29:33 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-01-15 13:32:09 +0100
commitef332247aa3408b2af862340cf3fe1ae4ee5054a (patch)
tree6a4680d9ad599861246053404211ec8b6d5675c5 /gui/test
parentfd02a14f3fad35f49cfd7b9deb3aae02fcf9dda2 (diff)
downloadmullvadvpn-ef332247aa3408b2af862340cf3fe1ae4ee5054a.tar.xz
mullvadvpn-ef332247aa3408b2af862340cf3fe1ae4ee5054a.zip
Use new logger
Diffstat (limited to 'gui/test')
-rw-r--r--gui/test/logging.spec.ts10
-rw-r--r--gui/test/setup/main.js4
-rw-r--r--gui/test/setup/renderer.ts4
3 files changed, 5 insertions, 13 deletions
diff --git a/gui/test/logging.spec.ts b/gui/test/logging.spec.ts
index 9572c6ed24..22c3db02fa 100644
--- a/gui/test/logging.spec.ts
+++ b/gui/test/logging.spec.ts
@@ -2,7 +2,7 @@ import { expect } from 'chai';
import fs from 'fs';
import sinon from 'sinon';
import { it, describe, before, beforeEach, after } from 'mocha';
-import * as logging from '../src/shared/logging';
+import { backupLogFile, rotateOrDeleteFile } from '../src/main/logging';
const aPath = 'log-directory/a.log';
const oldAPath = 'log-directory/a.old.log';
@@ -51,7 +51,7 @@ describe('Logging', () => {
});
it('should backup log file', () => {
- logging.backupLogFile(aPath);
+ backupLogFile(aPath);
const oldA = fs.readFileSync(oldAPath).toString();
expect(fs.accessSync.bind(null, aPath)).to.throw();
@@ -59,7 +59,7 @@ describe('Logging', () => {
});
it('should replace backup file', () => {
- logging.backupLogFile(bPath);
+ backupLogFile(bPath);
const oldB = fs.readFileSync(oldBPath).toString();
expect(fs.accessSync.bind(null, bPath)).to.throw();
@@ -67,13 +67,13 @@ describe('Logging', () => {
});
it('should clean up old log files', () => {
- logging.rotateOrDeleteFile(bPath);
+ rotateOrDeleteFile(bPath);
const oldB = fs.readFileSync(oldBPath).toString();
expect(fs.accessSync.bind(null, bPath)).to.throw();
expect(oldB).to.equal(initialFileState[bPath]);
- logging.rotateOrDeleteFile(bPath);
+ rotateOrDeleteFile(bPath);
expect(fs.accessSync.bind(null, bPath)).to.throw();
expect(fs.accessSync.bind(null, oldBPath)).to.throw();
diff --git a/gui/test/setup/main.js b/gui/test/setup/main.js
deleted file mode 100644
index dd458a30b6..0000000000
--- a/gui/test/setup/main.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const log = require('electron-log');
-
-log.transports.console.level = false;
-log.transports.file.level = false;
diff --git a/gui/test/setup/renderer.ts b/gui/test/setup/renderer.ts
index b8e1c5e2a3..05c236a2da 100644
--- a/gui/test/setup/renderer.ts
+++ b/gui/test/setup/renderer.ts
@@ -1,13 +1,9 @@
-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;
-
chai.use(spies);
chai.use(chaiAsPromised);