diff --git a/.husky/.gitignore b/.husky/.gitignore deleted file mode 100644 index 31354ec1..00000000 --- a/.husky/.gitignore +++ /dev/null @@ -1 +0,0 @@ -_ diff --git a/js/electron.js b/js/electron.js index a834f7ab..467ec782 100644 --- a/js/electron.js +++ b/js/electron.js @@ -102,7 +102,12 @@ app.on("ready", function () { // Quit when all windows are closed. app.on("window-all-closed", function () { - createWindow(); + if (process.env.JEST_WORKER_ID !== undefined) { + // if we are running with jest + app.quit(); + } else { + createWindow(); + }; }); app.on("activate", function () { diff --git a/package.json b/package.json index 229c8b1d..571a64c9 100644 --- a/package.json +++ b/package.json @@ -46,32 +46,32 @@ "homepage": "https://magicmirror.builders", "devDependencies": { "eslint-config-prettier": "^8.3.0", - "eslint-plugin-jsdoc": "^35.4.0", + "eslint-plugin-jsdoc": "^35.4.1", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-jest": "^24.3.6", "express-basic-auth": "^1.2.0", - "husky": "^6.0.0", - "jest": "27.0.5", + "husky": "^7.0.0", + "jest": "27.0.6", "jsdom": "^16.6.0", "lodash": "^4.17.21", "nyc": "^15.1.0", - "prettier": "^2.3.1", + "prettier": "^2.3.2", "pretty-quick": "^3.1.1", "sinon": "^11.1.1", - "spectron": "^13.0.0", + "spectron": "^15.0.0", "stylelint": "^13.13.1", "stylelint-config-prettier": "^8.0.2", "stylelint-config-standard": "^22.0.0", "stylelint-prettier": "^1.2.0" }, "optionalDependencies": { - "electron": "^11.4.9" + "electron": "^13.1.5" }, "dependencies": { "colors": "^1.4.0", "console-stamp": "^3.0.2", "digest-fetch": "^1.2.0", - "eslint": "^7.29.0", + "eslint": "^7.30.0", "express": "^4.17.1", "express-ipfilter": "^1.2.0", "feedme": "^2.0.2", diff --git a/tests/configs/env.js b/tests/configs/env.js index 99bd6b4e..e05424c8 100644 --- a/tests/configs/env.js +++ b/tests/configs/env.js @@ -13,7 +13,8 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, + contextIsolation: false } }, diff --git a/tests/configs/modules/clock/clock_12hr.js b/tests/configs/modules/clock/clock_12hr.js index bf3cedff..4e32f2e1 100644 --- a/tests/configs/modules/clock/clock_12hr.js +++ b/tests/configs/modules/clock/clock_12hr.js @@ -13,7 +13,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } }, diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js index 7813a10d..bd4cf459 100644 --- a/tests/configs/modules/clock/clock_24hr.js +++ b/tests/configs/modules/clock/clock_24hr.js @@ -13,7 +13,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } }, diff --git a/tests/configs/modules/clock/clock_analog.js b/tests/configs/modules/clock/clock_analog.js index b18412d0..f18e9fa7 100644 --- a/tests/configs/modules/clock/clock_analog.js +++ b/tests/configs/modules/clock/clock_analog.js @@ -12,7 +12,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } }, diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js index 292a8283..02e4e56a 100644 --- a/tests/configs/modules/clock/clock_displaySeconds_false.js +++ b/tests/configs/modules/clock/clock_displaySeconds_false.js @@ -13,7 +13,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } }, diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js index 5dd30222..dcf5b288 100644 --- a/tests/configs/modules/clock/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/clock_showPeriodUpper.js @@ -13,7 +13,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } }, diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js index ca9d4384..fe0dc0c7 100644 --- a/tests/configs/modules/clock/clock_showWeek.js +++ b/tests/configs/modules/clock/clock_showWeek.js @@ -13,7 +13,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } }, diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js index 82f5bfdb..14fd51d9 100644 --- a/tests/configs/modules/clock/es/clock_12hr.js +++ b/tests/configs/modules/clock/es/clock_12hr.js @@ -13,7 +13,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } }, diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js index 8db5aae2..5f973b4b 100644 --- a/tests/configs/modules/clock/es/clock_24hr.js +++ b/tests/configs/modules/clock/es/clock_24hr.js @@ -13,7 +13,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } }, diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js index 1d24a58a..1bcc440c 100644 --- a/tests/configs/modules/clock/es/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/es/clock_showPeriodUpper.js @@ -13,7 +13,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } }, diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js index d86db2d7..fc63ee22 100644 --- a/tests/configs/modules/clock/es/clock_showWeek.js +++ b/tests/configs/modules/clock/es/clock_showWeek.js @@ -14,7 +14,7 @@ let config = { electronOptions: { webPreferences: { nodeIntegration: true, - enableRemoteModule: true + enableRemoteModule: true, contextIsolation: false } },