From 870f7b5302ca42560099e1da76ff58bbff82cbd2 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sat, 11 Apr 2020 18:00:32 +0900
Subject: [PATCH] Update electron-log to 4.1.1 and fix proxy spec
---
package-lock.json | 6 +++---
package.json | 2 +-
spec/main/unit/proxy.spec.ts | 8 ++++++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 3659e05f..6e21c281 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10694,9 +10694,9 @@
}
},
"electron-log": {
- "version": "2.2.17",
- "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-2.2.17.tgz",
- "integrity": "sha512-v+Af5W5z99ehhaLOfE9eTSXUwjzh2wFlQjz51dvkZ6ZIrET6OB/zAZPvsuwT6tm3t5x+M1r+Ed3U3xtPZYAyuQ=="
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.1.1.tgz",
+ "integrity": "sha512-vkK3rNBOciRiinxrsdgg8hyUia+ct8ZMjBblvKjgNk4uHEDjjSyn313NOwv75xOMVIKlfmYzxaN8kR/oGC33aQ=="
},
"electron-mock-ipc": {
"version": "0.3.2",
diff --git a/package.json b/package.json
index 3845adb5..67c54b3c 100644
--- a/package.json
+++ b/package.json
@@ -175,7 +175,7 @@
"deep-extend": "^0.6.0",
"electron-context-menu": "^0.16.0",
"electron-json-storage": "^4.1.8",
- "electron-log": "^2.2.17",
+ "electron-log": "^4.1.1",
"electron-window-state": "^5.0.3",
"element-ui": "2.13.0",
"emoji-mart-vue": "^2.6.6",
diff --git a/spec/main/unit/proxy.spec.ts b/spec/main/unit/proxy.spec.ts
index b1ffc8a4..db179717 100644
--- a/spec/main/unit/proxy.spec.ts
+++ b/spec/main/unit/proxy.spec.ts
@@ -5,9 +5,13 @@ import { ManualProxy, ProxyProtocol } from '~/src/types/proxy'
const preferencesDBPath = path.resolve(__dirname, '../../preferences.json')
const proxyConfiguration = new ProxyConfiguration(preferencesDBPath)
-// electron.app is using in electron-json-storage
jest.mock('electron', () => ({
- app: jest.fn()
+ app: {
+ // getVersion is used by electron-log
+ getVersion: jest.fn(),
+ // getName is used by electron-json-storage
+ getName: jest.fn()
+ }
}))
describe('Parser', () => {