From a7ae79493d447bfd3d1d4d85b8ec433e82151237 Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Mon, 5 Jul 2021 00:33:50 +0200 Subject: [PATCH 1/9] refactor test config --- CHANGELOG.md | 1 + tests/configs/default.js | 21 +++++++++++++++++++ tests/configs/empty_ipWhiteList.js | 19 ++--------------- tests/configs/env.js | 17 +-------------- tests/configs/modules/alert/default.js | 16 ++------------ .../configs/modules/calendar/auth-default.js | 14 ++----------- tests/configs/modules/calendar/basic-auth.js | 14 ++----------- .../configs/modules/calendar/changed-port.js | 14 ++----------- tests/configs/modules/calendar/custom.js | 14 ++----------- tests/configs/modules/calendar/default.js | 14 ++----------- .../modules/calendar/fail-basic-auth.js | 14 ++----------- .../modules/calendar/old-basic-auth.js | 14 ++----------- tests/configs/modules/calendar/recurring.js | 14 ++----------- tests/configs/modules/clock/clock_12hr.js | 14 ++----------- tests/configs/modules/clock/clock_24hr.js | 16 ++------------ tests/configs/modules/clock/clock_analog.js | 16 ++------------ .../clock/clock_displaySeconds_false.js | 14 ++----------- .../modules/clock/clock_showPeriodUpper.js | 14 ++----------- tests/configs/modules/clock/clock_showWeek.js | 14 ++----------- tests/configs/modules/clock/es/clock_12hr.js | 13 ++---------- tests/configs/modules/clock/es/clock_24hr.js | 14 ++----------- .../modules/clock/es/clock_showPeriodUpper.js | 13 ++---------- .../modules/clock/es/clock_showWeek.js | 13 ++---------- .../compliments/compliments_anytime.js | 14 ++----------- .../modules/compliments/compliments_date.js | 14 ++----------- .../compliments/compliments_only_anytime.js | 14 ++----------- .../compliments/compliments_parts_day.js | 14 ++----------- tests/configs/modules/display.js | 8 ++----- .../configs/modules/helloworld/helloworld.js | 16 ++------------ .../modules/helloworld/helloworld_default.js | 16 ++------------ tests/configs/modules/newsfeed/default.js | 14 ++----------- .../configs/modules/newsfeed/incorrect_url.js | 14 ++----------- .../modules/newsfeed/prohibited_words.js | 14 ++----------- tests/configs/modules/positions.js | 16 ++------------ .../weather/currentweather_compliments.js | 17 ++------------- .../modules/weather/currentweather_default.js | 14 ++----------- .../modules/weather/currentweather_options.js | 16 ++------------ .../modules/weather/currentweather_units.js | 14 ++----------- .../weather/forecastweather_default.js | 14 ++----------- .../weather/forecastweather_options.js | 14 ++----------- .../modules/weather/forecastweather_units.js | 14 ++----------- tests/configs/noIpWhiteList.js | 19 ++--------------- tests/configs/port_8090.js | 19 ++--------------- tests/configs/without_modules.js | 17 ++------------- 44 files changed, 105 insertions(+), 534 deletions(-) create mode 100644 tests/configs/default.js diff --git a/CHANGELOG.md b/CHANGELOG.md index f3583ff7..36dcf39d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ _This release is scheduled to be released on 2021-07-01._ ### Updated - Bump electron to v13 (and spectron to v15) and update other dependencies in package.json. +- Refactor test configs, use default test config for all tests. ### Fixed diff --git a/tests/configs/default.js b/tests/configs/default.js new file mode 100644 index 00000000..fe066d19 --- /dev/null +++ b/tests/configs/default.js @@ -0,0 +1,21 @@ +let config = { + port: 8080, + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], + + language: "en", + timeFormat: 24, + units: "metric", + electronOptions: { + webPreferences: { + nodeIntegration: true, + enableRemoteModule: true, + contextIsolation: false + } + }, + + modules: [] +}; + +if (typeof module !== "undefined") { + module.exports = config; +} diff --git a/tests/configs/empty_ipWhiteList.js b/tests/configs/empty_ipWhiteList.js index 4b0d4057..1c9353b5 100644 --- a/tests/configs/empty_ipWhiteList.js +++ b/tests/configs/empty_ipWhiteList.js @@ -3,23 +3,8 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { - port: 8080, - ipWhitelist: [], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - - modules: [] -}; +let config = require('./default.js'); +config.ipWhitelist = []; /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/env.js b/tests/configs/env.js index e05424c8..9386d1c5 100644 --- a/tests/configs/env.js +++ b/tests/configs/env.js @@ -3,23 +3,8 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - - modules: [] -}; +let config = require('./default.js'); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/alert/default.js b/tests/configs/modules/alert/default.js index 8a358ec8..0713079b 100644 --- a/tests/configs/modules/alert/default.js +++ b/tests/configs/modules/alert/default.js @@ -4,20 +4,6 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - modules: [ { module: "alert", @@ -29,6 +15,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/calendar/auth-default.js b/tests/configs/modules/calendar/auth-default.js index 8eabfe21..0bc6bc78 100644 --- a/tests/configs/modules/calendar/auth-default.js +++ b/tests/configs/modules/calendar/auth-default.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -38,6 +26,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/calendar/basic-auth.js b/tests/configs/modules/calendar/basic-auth.js index 342da0e2..4243a237 100644 --- a/tests/configs/modules/calendar/basic-auth.js +++ b/tests/configs/modules/calendar/basic-auth.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -39,6 +27,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/calendar/changed-port.js b/tests/configs/modules/calendar/changed-port.js index ef59aea9..02f6d385 100644 --- a/tests/configs/modules/calendar/changed-port.js +++ b/tests/configs/modules/calendar/changed-port.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -38,6 +26,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/calendar/custom.js b/tests/configs/modules/calendar/custom.js index 721c0990..7e34bddd 100644 --- a/tests/configs/modules/calendar/custom.js +++ b/tests/configs/modules/calendar/custom.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -38,6 +26,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/calendar/default.js b/tests/configs/modules/calendar/default.js index ccb37af8..a532dd8d 100644 --- a/tests/configs/modules/calendar/default.js +++ b/tests/configs/modules/calendar/default.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -34,6 +22,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/calendar/fail-basic-auth.js b/tests/configs/modules/calendar/fail-basic-auth.js index 0ab1bdde..17427e63 100644 --- a/tests/configs/modules/calendar/fail-basic-auth.js +++ b/tests/configs/modules/calendar/fail-basic-auth.js @@ -6,19 +6,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -41,6 +29,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/calendar/old-basic-auth.js b/tests/configs/modules/calendar/old-basic-auth.js index 519acc9b..7ac4f930 100644 --- a/tests/configs/modules/calendar/old-basic-auth.js +++ b/tests/configs/modules/calendar/old-basic-auth.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -36,6 +24,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/calendar/recurring.js b/tests/configs/modules/calendar/recurring.js index a085ad07..04691813 100644 --- a/tests/configs/modules/calendar/recurring.js +++ b/tests/configs/modules/calendar/recurring.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -35,6 +23,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/clock_12hr.js b/tests/configs/modules/clock/clock_12hr.js index 9de222ed..016a10a4 100644 --- a/tests/configs/modules/clock/clock_12hr.js +++ b/tests/configs/modules/clock/clock_12hr.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -26,6 +14,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js index e5ec59e3..899d1e0a 100644 --- a/tests/configs/modules/clock/clock_24hr.js +++ b/tests/configs/modules/clock/clock_24hr.js @@ -4,20 +4,6 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - modules: [ { module: "clock", @@ -26,6 +12,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/clock_analog.js b/tests/configs/modules/clock/clock_analog.js index c76c10eb..54295b4f 100644 --- a/tests/configs/modules/clock/clock_analog.js +++ b/tests/configs/modules/clock/clock_analog.js @@ -3,20 +3,6 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - modules: [ { module: "clock", @@ -29,6 +15,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js index e74019d3..b39c0322 100644 --- a/tests/configs/modules/clock/clock_displaySeconds_false.js +++ b/tests/configs/modules/clock/clock_displaySeconds_false.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -29,6 +17,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js index 6819de54..a18c5b56 100644 --- a/tests/configs/modules/clock/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/clock_showPeriodUpper.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -29,6 +17,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js index 26b16194..63ba437f 100644 --- a/tests/configs/modules/clock/clock_showWeek.js +++ b/tests/configs/modules/clock/clock_showWeek.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -29,6 +17,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js index ed9d390d..d1c1d0e5 100644 --- a/tests/configs/modules/clock/es/clock_12hr.js +++ b/tests/configs/modules/clock/es/clock_12hr.js @@ -4,19 +4,8 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - language: "es", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -26,6 +15,8 @@ let config = { ] }; +config = Object.assign(require("../../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js index 985d579c..41d3e60b 100644 --- a/tests/configs/modules/clock/es/clock_24hr.js +++ b/tests/configs/modules/clock/es/clock_24hr.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - language: "es", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -26,6 +14,8 @@ let config = { ] }; +config = Object.assign(require("../../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js index 29c02155..6f8fb1d2 100644 --- a/tests/configs/modules/clock/es/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/es/clock_showPeriodUpper.js @@ -4,19 +4,8 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - language: "es", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -29,6 +18,8 @@ let config = { ] }; +config = Object.assign(require("../../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js index 95803d5a..dc90b1ed 100644 --- a/tests/configs/modules/clock/es/clock_showWeek.js +++ b/tests/configs/modules/clock/es/clock_showWeek.js @@ -5,19 +5,8 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - language: "es", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -30,6 +19,8 @@ let config = { ] }; +config = Object.assign(require("../../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/compliments/compliments_anytime.js b/tests/configs/modules/compliments/compliments_anytime.js index 8cc0fc07..acf5b684 100644 --- a/tests/configs/modules/compliments/compliments_anytime.js +++ b/tests/configs/modules/compliments/compliments_anytime.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -34,6 +22,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/compliments/compliments_date.js b/tests/configs/modules/compliments/compliments_date.js index 8403d10c..38ec2b7c 100644 --- a/tests/configs/modules/compliments/compliments_date.js +++ b/tests/configs/modules/compliments/compliments_date.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -35,6 +23,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/compliments/compliments_only_anytime.js b/tests/configs/modules/compliments/compliments_only_anytime.js index 758ac9b2..47d24fb5 100644 --- a/tests/configs/modules/compliments/compliments_only_anytime.js +++ b/tests/configs/modules/compliments/compliments_only_anytime.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -31,6 +19,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js index 51d5ea89..2d475c01 100644 --- a/tests/configs/modules/compliments/compliments_parts_day.js +++ b/tests/configs/modules/compliments/compliments_parts_day.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -33,6 +21,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/display.js b/tests/configs/modules/display.js index aae06520..1ea3ec97 100644 --- a/tests/configs/modules/display.js +++ b/tests/configs/modules/display.js @@ -4,12 +4,6 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", electronOptions: { fullscreen: false, width: 800, @@ -40,6 +34,8 @@ let config = { ] }; +config = Object.assign(require("../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/helloworld/helloworld.js b/tests/configs/modules/helloworld/helloworld.js index 3f83a0f9..126cadca 100644 --- a/tests/configs/modules/helloworld/helloworld.js +++ b/tests/configs/modules/helloworld/helloworld.js @@ -4,20 +4,6 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - modules: [ { module: "helloworld", @@ -29,6 +15,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/helloworld/helloworld_default.js b/tests/configs/modules/helloworld/helloworld_default.js index a0a9a29e..e091c796 100644 --- a/tests/configs/modules/helloworld/helloworld_default.js +++ b/tests/configs/modules/helloworld/helloworld_default.js @@ -4,20 +4,6 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - modules: [ { module: "helloworld", @@ -26,6 +12,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js index 59cf7d02..649bbcdd 100644 --- a/tests/configs/modules/newsfeed/default.js +++ b/tests/configs/modules/newsfeed/default.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -34,6 +22,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/newsfeed/incorrect_url.js b/tests/configs/modules/newsfeed/incorrect_url.js index afb093e0..242ad992 100644 --- a/tests/configs/modules/newsfeed/incorrect_url.js +++ b/tests/configs/modules/newsfeed/incorrect_url.js @@ -3,19 +3,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -33,6 +21,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/newsfeed/prohibited_words.js b/tests/configs/modules/newsfeed/prohibited_words.js index a21dd475..15ac8dd7 100644 --- a/tests/configs/modules/newsfeed/prohibited_words.js +++ b/tests/configs/modules/newsfeed/prohibited_words.js @@ -3,19 +3,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -35,6 +23,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js index a69b26fd..d3229532 100644 --- a/tests/configs/modules/positions.js +++ b/tests/configs/modules/positions.js @@ -4,20 +4,6 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - modules: // Using exotic content. This is why don't accept go to JSON configuration file (function () { @@ -36,6 +22,8 @@ let config = { })() }; +config = Object.assign(require("../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/weather/currentweather_compliments.js b/tests/configs/modules/weather/currentweather_compliments.js index 257c92cf..3b47ea65 100644 --- a/tests/configs/modules/weather/currentweather_compliments.js +++ b/tests/configs/modules/weather/currentweather_compliments.js @@ -4,21 +4,6 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - fullscreen: false, - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - modules: [ { module: "compliments", @@ -42,6 +27,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/weather/currentweather_default.js b/tests/configs/modules/weather/currentweather_default.js index 0cdac111..7e9859c7 100644 --- a/tests/configs/modules/weather/currentweather_default.js +++ b/tests/configs/modules/weather/currentweather_default.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -31,6 +19,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js index 568c7006..30f14e3b 100644 --- a/tests/configs/modules/weather/currentweather_options.js +++ b/tests/configs/modules/weather/currentweather_options.js @@ -4,20 +4,6 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - modules: [ { module: "weather", @@ -37,6 +23,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/weather/currentweather_units.js b/tests/configs/modules/weather/currentweather_units.js index 4c18a5eb..e6a487a7 100644 --- a/tests/configs/modules/weather/currentweather_units.js +++ b/tests/configs/modules/weather/currentweather_units.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, units: "imperial", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -33,6 +21,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/weather/forecastweather_default.js b/tests/configs/modules/weather/forecastweather_default.js index fc374c3b..c9385515 100644 --- a/tests/configs/modules/weather/forecastweather_default.js +++ b/tests/configs/modules/weather/forecastweather_default.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -33,6 +21,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/weather/forecastweather_options.js b/tests/configs/modules/weather/forecastweather_options.js index 4a1c5461..ad6883e9 100644 --- a/tests/configs/modules/weather/forecastweather_options.js +++ b/tests/configs/modules/weather/forecastweather_options.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", timeFormat: 12, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -36,6 +24,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/modules/weather/forecastweather_units.js b/tests/configs/modules/weather/forecastweather_units.js index 6e3d0dfb..af5c8f09 100644 --- a/tests/configs/modules/weather/forecastweather_units.js +++ b/tests/configs/modules/weather/forecastweather_units.js @@ -4,19 +4,7 @@ * MIT Licensed. */ let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, units: "imperial", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, modules: [ { @@ -34,6 +22,8 @@ let config = { ] }; +config = Object.assign(require("../../default.js"), config); + /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; diff --git a/tests/configs/noIpWhiteList.js b/tests/configs/noIpWhiteList.js index cb578296..6fe8e888 100644 --- a/tests/configs/noIpWhiteList.js +++ b/tests/configs/noIpWhiteList.js @@ -3,23 +3,8 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { - port: 8080, - ipWhitelist: ["x.x.x.x"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - - modules: [] -}; +let config = require('./default.js'); +config.ipWhitelist = ["x.x.x.x"]; /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/port_8090.js b/tests/configs/port_8090.js index e6813e5e..9771e40b 100644 --- a/tests/configs/port_8090.js +++ b/tests/configs/port_8090.js @@ -3,23 +3,8 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { - port: 8090, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - - modules: [] -}; +let config = require('./default.js'); +config.port = 8090; /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js index 46e721e5..d985a4f5 100644 --- a/tests/configs/without_modules.js +++ b/tests/configs/without_modules.js @@ -3,21 +3,8 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"], - - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - } -}; +let config = require('./default.js'); +delete config.modules; /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { From 659e1da79dc9cc0f14abe8483de7da1592433f4d Mon Sep 17 00:00:00 2001 From: karsten13 Date: Mon, 5 Jul 2021 00:40:01 +0200 Subject: [PATCH 2/9] run prettier --- tests/configs/empty_ipWhiteList.js | 2 +- tests/configs/env.js | 2 +- tests/configs/noIpWhiteList.js | 2 +- tests/configs/port_8090.js | 2 +- tests/configs/without_modules.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/configs/empty_ipWhiteList.js b/tests/configs/empty_ipWhiteList.js index 1c9353b5..6a0a9e95 100644 --- a/tests/configs/empty_ipWhiteList.js +++ b/tests/configs/empty_ipWhiteList.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = require('./default.js'); +let config = require("./default.js"); config.ipWhitelist = []; /*************** DO NOT EDIT THE LINE BELOW ***************/ diff --git a/tests/configs/env.js b/tests/configs/env.js index 9386d1c5..e5689d4c 100644 --- a/tests/configs/env.js +++ b/tests/configs/env.js @@ -4,7 +4,7 @@ * MIT Licensed. */ -let config = require('./default.js'); +let config = require("./default.js"); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/noIpWhiteList.js b/tests/configs/noIpWhiteList.js index 6fe8e888..f9d3698e 100644 --- a/tests/configs/noIpWhiteList.js +++ b/tests/configs/noIpWhiteList.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = require('./default.js'); +let config = require("./default.js"); config.ipWhitelist = ["x.x.x.x"]; /*************** DO NOT EDIT THE LINE BELOW ***************/ diff --git a/tests/configs/port_8090.js b/tests/configs/port_8090.js index 9771e40b..400a54e1 100644 --- a/tests/configs/port_8090.js +++ b/tests/configs/port_8090.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = require('./default.js'); +let config = require("./default.js"); config.port = 8090; /*************** DO NOT EDIT THE LINE BELOW ***************/ diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js index d985a4f5..78d56717 100644 --- a/tests/configs/without_modules.js +++ b/tests/configs/without_modules.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = require('./default.js'); +let config = require("./default.js"); delete config.modules; /*************** DO NOT EDIT THE LINE BELOW ***************/ From 7cfc3458ec9ec51a2ddec34f14d3528cfd8b2158 Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Mon, 5 Jul 2021 18:08:56 +0200 Subject: [PATCH 3/9] fix tests --- tests/configs/modules/display.js | 14 +++----------- tests/configs/without_modules.js | 6 +++++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/configs/modules/display.js b/tests/configs/modules/display.js index 1ea3ec97..24556659 100644 --- a/tests/configs/modules/display.js +++ b/tests/configs/modules/display.js @@ -4,17 +4,6 @@ * MIT Licensed. */ let config = { - electronOptions: { - fullscreen: false, - width: 800, - height: 600, - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, - modules: [ { module: "helloworld", @@ -35,6 +24,9 @@ let config = { }; config = Object.assign(require("../default.js"), config); +config.electronOptions.fullscreen = false; +config.electronOptions.width = 800; +config.electronOptions.height = 600; /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js index 78d56717..6e199b00 100644 --- a/tests/configs/without_modules.js +++ b/tests/configs/without_modules.js @@ -3,7 +3,11 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = require("./default.js"); +let config = { + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"] +}; + +config = Object.assign(require("./default.js"), config); delete config.modules; /*************** DO NOT EDIT THE LINE BELOW ***************/ From 2881d19d43f1c5ab1eb730212b823e0f46a9b878 Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Mon, 5 Jul 2021 18:27:14 +0200 Subject: [PATCH 4/9] remove env.js --- tests/configs/env.js | 12 ------------ tests/e2e/dev_console.js | 2 +- tests/e2e/env_spec.js | 2 +- tests/e2e/vendor_spec.js | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 tests/configs/env.js diff --git a/tests/configs/env.js b/tests/configs/env.js deleted file mode 100644 index e5689d4c..00000000 --- a/tests/configs/env.js +++ /dev/null @@ -1,12 +0,0 @@ -/* Magic Mirror Test config sample environment - * - * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com - * MIT Licensed. - */ - -let config = require("./default.js"); - -/*************** DO NOT EDIT THE LINE BELOW ***************/ -if (typeof module !== "undefined") { - module.exports = config; -} diff --git a/tests/e2e/dev_console.js b/tests/e2e/dev_console.js index 2a607e5b..06470645 100644 --- a/tests/e2e/dev_console.js +++ b/tests/e2e/dev_console.js @@ -7,7 +7,7 @@ describe("Development console tests", function () { beforeAll(function () { // Set config sample for use in test - process.env.MM_CONFIG_FILE = "tests/configs/env.js"; + process.env.MM_CONFIG_FILE = "tests/configs/default.js"; }); describe("Without 'dev' commandline argument", function () { diff --git a/tests/e2e/env_spec.js b/tests/e2e/env_spec.js index 706274a2..77605b4a 100644 --- a/tests/e2e/env_spec.js +++ b/tests/e2e/env_spec.js @@ -8,7 +8,7 @@ describe("Electron app environment", function () { beforeAll(function () { // Set config sample for use in test - process.env.MM_CONFIG_FILE = "tests/configs/env.js"; + process.env.MM_CONFIG_FILE = "tests/configs/default.js"; }); beforeEach(function () { diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js index b5289c2f..3c97515d 100644 --- a/tests/e2e/vendor_spec.js +++ b/tests/e2e/vendor_spec.js @@ -10,7 +10,7 @@ describe("Vendors", function () { let app = null; beforeAll(function () { - process.env.MM_CONFIG_FILE = "tests/configs/env.js"; + process.env.MM_CONFIG_FILE = "tests/configs/default.js"; return helpers .startApplication({ args: ["js/electron.js"] From 179989aa4237b3babc87c727891d20c7611008d3 Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Mon, 5 Jul 2021 19:21:39 +0200 Subject: [PATCH 5/9] add missing comments --- tests/configs/default.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/configs/default.js b/tests/configs/default.js index fe066d19..1b7068ad 100644 --- a/tests/configs/default.js +++ b/tests/configs/default.js @@ -1,3 +1,8 @@ +/* Magic Mirror Test default config for modules + * + * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com + * MIT Licensed. + */ let config = { port: 8080, ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], @@ -16,6 +21,7 @@ let config = { modules: [] }; +/*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { module.exports = config; } From bbb3accf0c3a1c89b1d7049d238d981ab92e8318 Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Mon, 5 Jul 2021 19:45:58 +0200 Subject: [PATCH 6/9] use factory --- tests/configs/modules/alert/default.js | 8 ++++---- tests/configs/modules/calendar/auth-default.js | 8 ++++---- tests/configs/modules/calendar/basic-auth.js | 8 ++++---- tests/configs/modules/calendar/changed-port.js | 8 ++++---- tests/configs/modules/calendar/custom.js | 8 ++++---- tests/configs/modules/calendar/default.js | 8 ++++---- tests/configs/modules/calendar/fail-basic-auth.js | 8 ++++---- tests/configs/modules/calendar/old-basic-auth.js | 8 ++++---- tests/configs/modules/calendar/recurring.js | 8 ++++---- tests/configs/modules/clock/clock_12hr.js | 8 ++++---- tests/configs/modules/clock/clock_24hr.js | 8 ++++---- tests/configs/modules/clock/clock_analog.js | 8 ++++---- .../configs/modules/clock/clock_displaySeconds_false.js | 8 ++++---- tests/configs/modules/clock/clock_showPeriodUpper.js | 8 ++++---- tests/configs/modules/clock/clock_showWeek.js | 8 ++++---- tests/configs/modules/clock/es/clock_12hr.js | 8 ++++---- tests/configs/modules/clock/es/clock_24hr.js | 8 ++++---- tests/configs/modules/clock/es/clock_showPeriodUpper.js | 8 ++++---- tests/configs/modules/clock/es/clock_showWeek.js | 8 ++++---- tests/configs/modules/compliments/compliments_anytime.js | 8 ++++---- tests/configs/modules/compliments/compliments_date.js | 8 ++++---- .../modules/compliments/compliments_only_anytime.js | 8 ++++---- .../configs/modules/compliments/compliments_parts_day.js | 8 ++++---- tests/configs/modules/display.js | 7 ++++--- tests/configs/modules/helloworld/helloworld.js | 8 ++++---- tests/configs/modules/helloworld/helloworld_default.js | 8 ++++---- tests/configs/modules/newsfeed/default.js | 8 ++++---- tests/configs/modules/newsfeed/incorrect_url.js | 8 ++++---- tests/configs/modules/newsfeed/prohibited_words.js | 8 ++++---- tests/configs/modules/positions.js | 8 ++++---- .../modules/weather/currentweather_compliments.js | 8 ++++---- tests/configs/modules/weather/currentweather_default.js | 8 ++++---- tests/configs/modules/weather/currentweather_options.js | 8 ++++---- tests/configs/modules/weather/currentweather_units.js | 8 ++++---- tests/configs/modules/weather/forecastweather_default.js | 8 ++++---- tests/configs/modules/weather/forecastweather_options.js | 8 ++++---- tests/configs/modules/weather/forecastweather_units.js | 8 ++++---- tests/configs/without_modules.js | 9 ++++----- 38 files changed, 152 insertions(+), 152 deletions(-) diff --git a/tests/configs/modules/alert/default.js b/tests/configs/modules/alert/default.js index 0713079b..e43c427d 100644 --- a/tests/configs/modules/alert/default.js +++ b/tests/configs/modules/alert/default.js @@ -3,7 +3,9 @@ * By rejas * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ modules: [ { module: "alert", @@ -13,9 +15,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/calendar/auth-default.js b/tests/configs/modules/calendar/auth-default.js index 0bc6bc78..af1074bf 100644 --- a/tests/configs/modules/calendar/auth-default.js +++ b/tests/configs/modules/calendar/auth-default.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -24,9 +26,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/calendar/basic-auth.js b/tests/configs/modules/calendar/basic-auth.js index 4243a237..23de5d3f 100644 --- a/tests/configs/modules/calendar/basic-auth.js +++ b/tests/configs/modules/calendar/basic-auth.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -25,9 +27,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/calendar/changed-port.js b/tests/configs/modules/calendar/changed-port.js index 02f6d385..e181dbdf 100644 --- a/tests/configs/modules/calendar/changed-port.js +++ b/tests/configs/modules/calendar/changed-port.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -24,9 +26,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/calendar/custom.js b/tests/configs/modules/calendar/custom.js index 7e34bddd..353de3c8 100644 --- a/tests/configs/modules/calendar/custom.js +++ b/tests/configs/modules/calendar/custom.js @@ -3,7 +3,9 @@ * By Rejas * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -24,9 +26,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/calendar/default.js b/tests/configs/modules/calendar/default.js index a532dd8d..5e75513f 100644 --- a/tests/configs/modules/calendar/default.js +++ b/tests/configs/modules/calendar/default.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -20,9 +22,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/calendar/fail-basic-auth.js b/tests/configs/modules/calendar/fail-basic-auth.js index 17427e63..92f36827 100644 --- a/tests/configs/modules/calendar/fail-basic-auth.js +++ b/tests/configs/modules/calendar/fail-basic-auth.js @@ -5,7 +5,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -27,9 +29,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/calendar/old-basic-auth.js b/tests/configs/modules/calendar/old-basic-auth.js index 7ac4f930..5611245d 100644 --- a/tests/configs/modules/calendar/old-basic-auth.js +++ b/tests/configs/modules/calendar/old-basic-auth.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -22,9 +24,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/calendar/recurring.js b/tests/configs/modules/calendar/recurring.js index 04691813..5f3fedc0 100644 --- a/tests/configs/modules/calendar/recurring.js +++ b/tests/configs/modules/calendar/recurring.js @@ -3,7 +3,9 @@ * By Rejas * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -21,9 +23,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/clock_12hr.js b/tests/configs/modules/clock/clock_12hr.js index 016a10a4..3f7ea748 100644 --- a/tests/configs/modules/clock/clock_12hr.js +++ b/tests/configs/modules/clock/clock_12hr.js @@ -3,7 +3,9 @@ * By Sergey Morozov * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -12,9 +14,7 @@ let config = { position: "middle_center" } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js index 899d1e0a..77a0948e 100644 --- a/tests/configs/modules/clock/clock_24hr.js +++ b/tests/configs/modules/clock/clock_24hr.js @@ -3,16 +3,16 @@ * By Sergey Morozov * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ modules: [ { module: "clock", position: "middle_center" } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/clock_analog.js b/tests/configs/modules/clock/clock_analog.js index 54295b4f..c9f13aae 100644 --- a/tests/configs/modules/clock/clock_analog.js +++ b/tests/configs/modules/clock/clock_analog.js @@ -2,7 +2,9 @@ * * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ modules: [ { module: "clock", @@ -13,9 +15,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js index b39c0322..dd7eee9b 100644 --- a/tests/configs/modules/clock/clock_displaySeconds_false.js +++ b/tests/configs/modules/clock/clock_displaySeconds_false.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -15,9 +17,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js index a18c5b56..98acafce 100644 --- a/tests/configs/modules/clock/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/clock_showPeriodUpper.js @@ -3,7 +3,9 @@ * By Sergey Morozov * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -15,9 +17,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js index 63ba437f..182d5d1e 100644 --- a/tests/configs/modules/clock/clock_showWeek.js +++ b/tests/configs/modules/clock/clock_showWeek.js @@ -3,7 +3,9 @@ * By Johan Hammar * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -15,9 +17,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js index d1c1d0e5..7313a814 100644 --- a/tests/configs/modules/clock/es/clock_12hr.js +++ b/tests/configs/modules/clock/es/clock_12hr.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../../default.js') + +const config = configFacory({ language: "es", timeFormat: 12, @@ -13,9 +15,7 @@ let config = { position: "middle_center" } ] -}; - -config = Object.assign(require("../../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js index 41d3e60b..715a47ba 100644 --- a/tests/configs/modules/clock/es/clock_24hr.js +++ b/tests/configs/modules/clock/es/clock_24hr.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../../default.js') + +const config = configFacory({ language: "es", modules: [ @@ -12,9 +14,7 @@ let config = { position: "middle_center" } ] -}; - -config = Object.assign(require("../../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js index 6f8fb1d2..2bff573b 100644 --- a/tests/configs/modules/clock/es/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/es/clock_showPeriodUpper.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../../default.js') + +const config = configFacory({ language: "es", timeFormat: 12, @@ -16,9 +18,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js index dc90b1ed..bcb00b49 100644 --- a/tests/configs/modules/clock/es/clock_showWeek.js +++ b/tests/configs/modules/clock/es/clock_showWeek.js @@ -4,7 +4,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../../default.js') + +const config = configFacory({ language: "es", timeFormat: 12, @@ -17,9 +19,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/compliments/compliments_anytime.js b/tests/configs/modules/compliments/compliments_anytime.js index acf5b684..5fb90091 100644 --- a/tests/configs/modules/compliments/compliments_anytime.js +++ b/tests/configs/modules/compliments/compliments_anytime.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -20,9 +22,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/compliments/compliments_date.js b/tests/configs/modules/compliments/compliments_date.js index 38ec2b7c..07ce74fe 100644 --- a/tests/configs/modules/compliments/compliments_date.js +++ b/tests/configs/modules/compliments/compliments_date.js @@ -3,7 +3,9 @@ * By Rejas * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -21,9 +23,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/compliments/compliments_only_anytime.js b/tests/configs/modules/compliments/compliments_only_anytime.js index 47d24fb5..8ff8c76d 100644 --- a/tests/configs/modules/compliments/compliments_only_anytime.js +++ b/tests/configs/modules/compliments/compliments_only_anytime.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -17,9 +19,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js index 2d475c01..c4685ea7 100644 --- a/tests/configs/modules/compliments/compliments_parts_day.js +++ b/tests/configs/modules/compliments/compliments_parts_day.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -19,9 +21,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/display.js b/tests/configs/modules/display.js index 24556659..176c2d2a 100644 --- a/tests/configs/modules/display.js +++ b/tests/configs/modules/display.js @@ -3,7 +3,9 @@ * By Rejas * MIT Licensed. */ -let config = { +const configFactory = require('../default.js') + +let config = configFacory({ modules: [ { module: "helloworld", @@ -21,9 +23,8 @@ let config = { } } ] -}; +}); -config = Object.assign(require("../default.js"), config); config.electronOptions.fullscreen = false; config.electronOptions.width = 800; config.electronOptions.height = 600; diff --git a/tests/configs/modules/helloworld/helloworld.js b/tests/configs/modules/helloworld/helloworld.js index 126cadca..770daf39 100644 --- a/tests/configs/modules/helloworld/helloworld.js +++ b/tests/configs/modules/helloworld/helloworld.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ modules: [ { module: "helloworld", @@ -13,9 +15,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/helloworld/helloworld_default.js b/tests/configs/modules/helloworld/helloworld_default.js index e091c796..cbe15e80 100644 --- a/tests/configs/modules/helloworld/helloworld_default.js +++ b/tests/configs/modules/helloworld/helloworld_default.js @@ -3,16 +3,16 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ modules: [ { module: "helloworld", position: "bottom_bar" } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js index 649bbcdd..8faf9b5e 100644 --- a/tests/configs/modules/newsfeed/default.js +++ b/tests/configs/modules/newsfeed/default.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -20,9 +22,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/newsfeed/incorrect_url.js b/tests/configs/modules/newsfeed/incorrect_url.js index 242ad992..c81729e6 100644 --- a/tests/configs/modules/newsfeed/incorrect_url.js +++ b/tests/configs/modules/newsfeed/incorrect_url.js @@ -2,7 +2,9 @@ * * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -19,9 +21,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/newsfeed/prohibited_words.js b/tests/configs/modules/newsfeed/prohibited_words.js index 15ac8dd7..ca567d35 100644 --- a/tests/configs/modules/newsfeed/prohibited_words.js +++ b/tests/configs/modules/newsfeed/prohibited_words.js @@ -2,7 +2,9 @@ * * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -21,9 +23,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js index d3229532..1794a1fb 100644 --- a/tests/configs/modules/positions.js +++ b/tests/configs/modules/positions.js @@ -3,7 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { +const configFactory = require('../default.js') + +const config = configFacory({ modules: // Using exotic content. This is why don't accept go to JSON configuration file (function () { @@ -20,9 +22,7 @@ let config = { } return modules; })() -}; - -config = Object.assign(require("../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/weather/currentweather_compliments.js b/tests/configs/modules/weather/currentweather_compliments.js index 3b47ea65..fb8929ca 100644 --- a/tests/configs/modules/weather/currentweather_compliments.js +++ b/tests/configs/modules/weather/currentweather_compliments.js @@ -3,7 +3,9 @@ * By rejas https://github.com/rejas * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ modules: [ { module: "compliments", @@ -25,9 +27,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/weather/currentweather_default.js b/tests/configs/modules/weather/currentweather_default.js index 7e9859c7..d753d28f 100644 --- a/tests/configs/modules/weather/currentweather_default.js +++ b/tests/configs/modules/weather/currentweather_default.js @@ -3,7 +3,9 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -17,9 +19,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js index 30f14e3b..7af1a9f3 100644 --- a/tests/configs/modules/weather/currentweather_options.js +++ b/tests/configs/modules/weather/currentweather_options.js @@ -3,7 +3,9 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ modules: [ { module: "weather", @@ -21,9 +23,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/weather/currentweather_units.js b/tests/configs/modules/weather/currentweather_units.js index e6a487a7..77792cb6 100644 --- a/tests/configs/modules/weather/currentweather_units.js +++ b/tests/configs/modules/weather/currentweather_units.js @@ -3,7 +3,9 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ units: "imperial", modules: [ @@ -19,9 +21,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/weather/forecastweather_default.js b/tests/configs/modules/weather/forecastweather_default.js index c9385515..ff9769a9 100644 --- a/tests/configs/modules/weather/forecastweather_default.js +++ b/tests/configs/modules/weather/forecastweather_default.js @@ -3,7 +3,9 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -19,9 +21,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/weather/forecastweather_options.js b/tests/configs/modules/weather/forecastweather_options.js index ad6883e9..9952e9c5 100644 --- a/tests/configs/modules/weather/forecastweather_options.js +++ b/tests/configs/modules/weather/forecastweather_options.js @@ -3,7 +3,9 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ timeFormat: 12, modules: [ @@ -22,9 +24,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/weather/forecastweather_units.js b/tests/configs/modules/weather/forecastweather_units.js index af5c8f09..e17e1a20 100644 --- a/tests/configs/modules/weather/forecastweather_units.js +++ b/tests/configs/modules/weather/forecastweather_units.js @@ -3,7 +3,9 @@ * By rejas * MIT Licensed. */ -let config = { +const configFactory = require('../../default.js') + +const config = configFacory({ units: "imperial", modules: [ @@ -20,9 +22,7 @@ let config = { } } ] -}; - -config = Object.assign(require("../../default.js"), config); +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js index 6e199b00..a9eec34a 100644 --- a/tests/configs/without_modules.js +++ b/tests/configs/without_modules.js @@ -3,12 +3,11 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"] -}; +const configFactory = require('./default.js') -config = Object.assign(require("./default.js"), config); -delete config.modules; +const config = configFacory({ + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"] +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { From 209e049893aba66f8bbf8c3dfe5cf2e65ce1400d Mon Sep 17 00:00:00 2001 From: karsten13 Date: Mon, 5 Jul 2021 19:51:18 +0200 Subject: [PATCH 7/9] run prettier --- tests/configs/modules/alert/default.js | 2 +- tests/configs/modules/calendar/auth-default.js | 2 +- tests/configs/modules/calendar/basic-auth.js | 2 +- tests/configs/modules/calendar/changed-port.js | 2 +- tests/configs/modules/calendar/custom.js | 2 +- tests/configs/modules/calendar/default.js | 2 +- tests/configs/modules/calendar/fail-basic-auth.js | 2 +- tests/configs/modules/calendar/old-basic-auth.js | 2 +- tests/configs/modules/calendar/recurring.js | 2 +- tests/configs/modules/clock/clock_12hr.js | 2 +- tests/configs/modules/clock/clock_24hr.js | 2 +- tests/configs/modules/clock/clock_analog.js | 2 +- tests/configs/modules/clock/clock_displaySeconds_false.js | 2 +- tests/configs/modules/clock/clock_showPeriodUpper.js | 2 +- tests/configs/modules/clock/clock_showWeek.js | 2 +- tests/configs/modules/clock/es/clock_12hr.js | 2 +- tests/configs/modules/clock/es/clock_24hr.js | 2 +- tests/configs/modules/clock/es/clock_showPeriodUpper.js | 2 +- tests/configs/modules/clock/es/clock_showWeek.js | 2 +- tests/configs/modules/compliments/compliments_anytime.js | 2 +- tests/configs/modules/compliments/compliments_date.js | 2 +- tests/configs/modules/compliments/compliments_only_anytime.js | 2 +- tests/configs/modules/compliments/compliments_parts_day.js | 2 +- tests/configs/modules/display.js | 2 +- tests/configs/modules/helloworld/helloworld.js | 2 +- tests/configs/modules/helloworld/helloworld_default.js | 2 +- tests/configs/modules/newsfeed/default.js | 2 +- tests/configs/modules/newsfeed/incorrect_url.js | 2 +- tests/configs/modules/newsfeed/prohibited_words.js | 2 +- tests/configs/modules/positions.js | 2 +- tests/configs/modules/weather/currentweather_compliments.js | 2 +- tests/configs/modules/weather/currentweather_default.js | 2 +- tests/configs/modules/weather/currentweather_options.js | 2 +- tests/configs/modules/weather/currentweather_units.js | 2 +- tests/configs/modules/weather/forecastweather_default.js | 2 +- tests/configs/modules/weather/forecastweather_options.js | 2 +- tests/configs/modules/weather/forecastweather_units.js | 2 +- tests/configs/without_modules.js | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/tests/configs/modules/alert/default.js b/tests/configs/modules/alert/default.js index e43c427d..fd1d48bd 100644 --- a/tests/configs/modules/alert/default.js +++ b/tests/configs/modules/alert/default.js @@ -3,7 +3,7 @@ * By rejas * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ modules: [ diff --git a/tests/configs/modules/calendar/auth-default.js b/tests/configs/modules/calendar/auth-default.js index af1074bf..e87e2f99 100644 --- a/tests/configs/modules/calendar/auth-default.js +++ b/tests/configs/modules/calendar/auth-default.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/calendar/basic-auth.js b/tests/configs/modules/calendar/basic-auth.js index 23de5d3f..b62739c0 100644 --- a/tests/configs/modules/calendar/basic-auth.js +++ b/tests/configs/modules/calendar/basic-auth.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/calendar/changed-port.js b/tests/configs/modules/calendar/changed-port.js index e181dbdf..e0c70d75 100644 --- a/tests/configs/modules/calendar/changed-port.js +++ b/tests/configs/modules/calendar/changed-port.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/calendar/custom.js b/tests/configs/modules/calendar/custom.js index 353de3c8..5a289fe0 100644 --- a/tests/configs/modules/calendar/custom.js +++ b/tests/configs/modules/calendar/custom.js @@ -3,7 +3,7 @@ * By Rejas * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/calendar/default.js b/tests/configs/modules/calendar/default.js index 5e75513f..40801e9a 100644 --- a/tests/configs/modules/calendar/default.js +++ b/tests/configs/modules/calendar/default.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/calendar/fail-basic-auth.js b/tests/configs/modules/calendar/fail-basic-auth.js index 92f36827..16bbaa92 100644 --- a/tests/configs/modules/calendar/fail-basic-auth.js +++ b/tests/configs/modules/calendar/fail-basic-auth.js @@ -5,7 +5,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/calendar/old-basic-auth.js b/tests/configs/modules/calendar/old-basic-auth.js index 5611245d..b7688557 100644 --- a/tests/configs/modules/calendar/old-basic-auth.js +++ b/tests/configs/modules/calendar/old-basic-auth.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/calendar/recurring.js b/tests/configs/modules/calendar/recurring.js index 5f3fedc0..6e361081 100644 --- a/tests/configs/modules/calendar/recurring.js +++ b/tests/configs/modules/calendar/recurring.js @@ -3,7 +3,7 @@ * By Rejas * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/clock/clock_12hr.js b/tests/configs/modules/clock/clock_12hr.js index 3f7ea748..3dc815a1 100644 --- a/tests/configs/modules/clock/clock_12hr.js +++ b/tests/configs/modules/clock/clock_12hr.js @@ -3,7 +3,7 @@ * By Sergey Morozov * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js index 77a0948e..7b9c2479 100644 --- a/tests/configs/modules/clock/clock_24hr.js +++ b/tests/configs/modules/clock/clock_24hr.js @@ -3,7 +3,7 @@ * By Sergey Morozov * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ modules: [ diff --git a/tests/configs/modules/clock/clock_analog.js b/tests/configs/modules/clock/clock_analog.js index c9f13aae..34cae41d 100644 --- a/tests/configs/modules/clock/clock_analog.js +++ b/tests/configs/modules/clock/clock_analog.js @@ -2,7 +2,7 @@ * * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ modules: [ diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js index dd7eee9b..19ebcc99 100644 --- a/tests/configs/modules/clock/clock_displaySeconds_false.js +++ b/tests/configs/modules/clock/clock_displaySeconds_false.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js index 98acafce..7275c8aa 100644 --- a/tests/configs/modules/clock/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/clock_showPeriodUpper.js @@ -3,7 +3,7 @@ * By Sergey Morozov * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js index 182d5d1e..5519d3f7 100644 --- a/tests/configs/modules/clock/clock_showWeek.js +++ b/tests/configs/modules/clock/clock_showWeek.js @@ -3,7 +3,7 @@ * By Johan Hammar * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js index 7313a814..adf430c0 100644 --- a/tests/configs/modules/clock/es/clock_12hr.js +++ b/tests/configs/modules/clock/es/clock_12hr.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../../default.js') +const configFactory = require("../../../default.js"); const config = configFacory({ language: "es", diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js index 715a47ba..a5772341 100644 --- a/tests/configs/modules/clock/es/clock_24hr.js +++ b/tests/configs/modules/clock/es/clock_24hr.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../../default.js') +const configFactory = require("../../../default.js"); const config = configFacory({ language: "es", diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js index 2bff573b..e432ff91 100644 --- a/tests/configs/modules/clock/es/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/es/clock_showPeriodUpper.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../../default.js') +const configFactory = require("../../../default.js"); const config = configFacory({ language: "es", diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js index bcb00b49..71b16e15 100644 --- a/tests/configs/modules/clock/es/clock_showWeek.js +++ b/tests/configs/modules/clock/es/clock_showWeek.js @@ -4,7 +4,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../../default.js') +const configFactory = require("../../../default.js"); const config = configFacory({ language: "es", diff --git a/tests/configs/modules/compliments/compliments_anytime.js b/tests/configs/modules/compliments/compliments_anytime.js index 5fb90091..7f12efe2 100644 --- a/tests/configs/modules/compliments/compliments_anytime.js +++ b/tests/configs/modules/compliments/compliments_anytime.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/compliments/compliments_date.js b/tests/configs/modules/compliments/compliments_date.js index 07ce74fe..1dfb2512 100644 --- a/tests/configs/modules/compliments/compliments_date.js +++ b/tests/configs/modules/compliments/compliments_date.js @@ -3,7 +3,7 @@ * By Rejas * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/compliments/compliments_only_anytime.js b/tests/configs/modules/compliments/compliments_only_anytime.js index 8ff8c76d..ea1eab13 100644 --- a/tests/configs/modules/compliments/compliments_only_anytime.js +++ b/tests/configs/modules/compliments/compliments_only_anytime.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js index c4685ea7..cf7dfa97 100644 --- a/tests/configs/modules/compliments/compliments_parts_day.js +++ b/tests/configs/modules/compliments/compliments_parts_day.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/display.js b/tests/configs/modules/display.js index 176c2d2a..c7684cd2 100644 --- a/tests/configs/modules/display.js +++ b/tests/configs/modules/display.js @@ -3,7 +3,7 @@ * By Rejas * MIT Licensed. */ -const configFactory = require('../default.js') +const configFactory = require("../default.js"); let config = configFacory({ modules: [ diff --git a/tests/configs/modules/helloworld/helloworld.js b/tests/configs/modules/helloworld/helloworld.js index 770daf39..8525ee62 100644 --- a/tests/configs/modules/helloworld/helloworld.js +++ b/tests/configs/modules/helloworld/helloworld.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ modules: [ diff --git a/tests/configs/modules/helloworld/helloworld_default.js b/tests/configs/modules/helloworld/helloworld_default.js index cbe15e80..7c656fb9 100644 --- a/tests/configs/modules/helloworld/helloworld_default.js +++ b/tests/configs/modules/helloworld/helloworld_default.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ modules: [ diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js index 8faf9b5e..958e65f4 100644 --- a/tests/configs/modules/newsfeed/default.js +++ b/tests/configs/modules/newsfeed/default.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/newsfeed/incorrect_url.js b/tests/configs/modules/newsfeed/incorrect_url.js index c81729e6..058a4b6b 100644 --- a/tests/configs/modules/newsfeed/incorrect_url.js +++ b/tests/configs/modules/newsfeed/incorrect_url.js @@ -2,7 +2,7 @@ * * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/newsfeed/prohibited_words.js b/tests/configs/modules/newsfeed/prohibited_words.js index ca567d35..68c69f10 100644 --- a/tests/configs/modules/newsfeed/prohibited_words.js +++ b/tests/configs/modules/newsfeed/prohibited_words.js @@ -2,7 +2,7 @@ * * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js index 1794a1fb..9a9fd441 100644 --- a/tests/configs/modules/positions.js +++ b/tests/configs/modules/positions.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('../default.js') +const configFactory = require("../default.js"); const config = configFacory({ modules: diff --git a/tests/configs/modules/weather/currentweather_compliments.js b/tests/configs/modules/weather/currentweather_compliments.js index fb8929ca..8a96c6b1 100644 --- a/tests/configs/modules/weather/currentweather_compliments.js +++ b/tests/configs/modules/weather/currentweather_compliments.js @@ -3,7 +3,7 @@ * By rejas https://github.com/rejas * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ modules: [ diff --git a/tests/configs/modules/weather/currentweather_default.js b/tests/configs/modules/weather/currentweather_default.js index d753d28f..02208ec4 100644 --- a/tests/configs/modules/weather/currentweather_default.js +++ b/tests/configs/modules/weather/currentweather_default.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js index 7af1a9f3..0bbf32b6 100644 --- a/tests/configs/modules/weather/currentweather_options.js +++ b/tests/configs/modules/weather/currentweather_options.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ modules: [ diff --git a/tests/configs/modules/weather/currentweather_units.js b/tests/configs/modules/weather/currentweather_units.js index 77792cb6..236061ef 100644 --- a/tests/configs/modules/weather/currentweather_units.js +++ b/tests/configs/modules/weather/currentweather_units.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ units: "imperial", diff --git a/tests/configs/modules/weather/forecastweather_default.js b/tests/configs/modules/weather/forecastweather_default.js index ff9769a9..e3a725d7 100644 --- a/tests/configs/modules/weather/forecastweather_default.js +++ b/tests/configs/modules/weather/forecastweather_default.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/weather/forecastweather_options.js b/tests/configs/modules/weather/forecastweather_options.js index 9952e9c5..616ef626 100644 --- a/tests/configs/modules/weather/forecastweather_options.js +++ b/tests/configs/modules/weather/forecastweather_options.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ timeFormat: 12, diff --git a/tests/configs/modules/weather/forecastweather_units.js b/tests/configs/modules/weather/forecastweather_units.js index e17e1a20..2a9785cd 100644 --- a/tests/configs/modules/weather/forecastweather_units.js +++ b/tests/configs/modules/weather/forecastweather_units.js @@ -3,7 +3,7 @@ * By rejas * MIT Licensed. */ -const configFactory = require('../../default.js') +const configFactory = require("../../default.js"); const config = configFacory({ units: "imperial", diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js index a9eec34a..198f857d 100644 --- a/tests/configs/without_modules.js +++ b/tests/configs/without_modules.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require('./default.js') +const configFactory = require("./default.js"); const config = configFacory({ ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"] From 9aa0af4f9c1d57bdac7f2a067d83414fd388de5f Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Mon, 5 Jul 2021 19:57:04 +0200 Subject: [PATCH 8/9] factory again --- tests/configs/default.js | 35 +++++++++---------- tests/configs/empty_ipWhiteList.js | 5 +-- tests/configs/env.js | 11 ++++++ tests/configs/modules/alert/default.js | 4 +-- .../configs/modules/calendar/auth-default.js | 4 +-- tests/configs/modules/calendar/basic-auth.js | 4 +-- .../configs/modules/calendar/changed-port.js | 4 +-- tests/configs/modules/calendar/custom.js | 4 +-- tests/configs/modules/calendar/default.js | 4 +-- .../modules/calendar/fail-basic-auth.js | 4 +-- .../modules/calendar/old-basic-auth.js | 4 +-- tests/configs/modules/calendar/recurring.js | 4 +-- tests/configs/modules/clock/clock_12hr.js | 4 +-- tests/configs/modules/clock/clock_24hr.js | 4 +-- tests/configs/modules/clock/clock_analog.js | 4 +-- .../clock/clock_displaySeconds_false.js | 4 +-- .../modules/clock/clock_showPeriodUpper.js | 4 +-- tests/configs/modules/clock/clock_showWeek.js | 4 +-- tests/configs/modules/clock/es/clock_12hr.js | 4 +-- tests/configs/modules/clock/es/clock_24hr.js | 4 +-- .../modules/clock/es/clock_showPeriodUpper.js | 4 +-- .../modules/clock/es/clock_showWeek.js | 4 +-- .../compliments/compliments_anytime.js | 4 +-- .../modules/compliments/compliments_date.js | 4 +-- .../compliments/compliments_only_anytime.js | 4 +-- .../compliments/compliments_parts_day.js | 4 +-- tests/configs/modules/display.js | 4 +-- .../configs/modules/helloworld/helloworld.js | 4 +-- .../modules/helloworld/helloworld_default.js | 4 +-- tests/configs/modules/newsfeed/default.js | 4 +-- .../configs/modules/newsfeed/incorrect_url.js | 4 +-- .../modules/newsfeed/prohibited_words.js | 4 +-- tests/configs/modules/positions.js | 4 +-- .../weather/currentweather_compliments.js | 4 +-- .../modules/weather/currentweather_default.js | 4 +-- .../modules/weather/currentweather_options.js | 4 +-- .../modules/weather/currentweather_units.js | 4 +-- .../weather/forecastweather_default.js | 4 +-- .../weather/forecastweather_options.js | 4 +-- .../modules/weather/forecastweather_units.js | 4 +-- tests/configs/noIpWhiteList.js | 5 +-- tests/configs/port_8090.js | 5 +-- tests/configs/without_modules.js | 4 +-- tests/e2e/dev_console.js | 2 +- tests/e2e/env_spec.js | 2 +- tests/e2e/vendor_spec.js | 2 +- 46 files changed, 77 insertions(+), 142 deletions(-) create mode 100644 tests/configs/env.js diff --git a/tests/configs/default.js b/tests/configs/default.js index 1b7068ad..030769eb 100644 --- a/tests/configs/default.js +++ b/tests/configs/default.js @@ -3,25 +3,22 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = { - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], +exports.configFactory = function (options) { + return Object.assign({ + port: 8080, + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } - }, + language: "en", + timeFormat: 24, + units: "metric", + electronOptions: { + webPreferences: { + nodeIntegration: true, + enableRemoteModule: true, + contextIsolation: false + } + }, - modules: [] + modules: [] + }, options); }; - -/*************** DO NOT EDIT THE LINE BELOW ***************/ -if (typeof module !== "undefined") { - module.exports = config; -} diff --git a/tests/configs/empty_ipWhiteList.js b/tests/configs/empty_ipWhiteList.js index 6a0a9e95..e2826e93 100644 --- a/tests/configs/empty_ipWhiteList.js +++ b/tests/configs/empty_ipWhiteList.js @@ -3,8 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = require("./default.js"); -config.ipWhitelist = []; +const config = require("./default.js").configFactory({ + ipWhitelist: [] +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/env.js b/tests/configs/env.js new file mode 100644 index 00000000..5673d988 --- /dev/null +++ b/tests/configs/env.js @@ -0,0 +1,11 @@ +/* Magic Mirror Test config sample environment + * + * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com + * MIT Licensed. + */ +const config = require("./default.js").configFactory(); + +/*************** DO NOT EDIT THE LINE BELOW ***************/ +if (typeof module !== "undefined") { + module.exports = config; +} diff --git a/tests/configs/modules/alert/default.js b/tests/configs/modules/alert/default.js index fd1d48bd..423e9462 100644 --- a/tests/configs/modules/alert/default.js +++ b/tests/configs/modules/alert/default.js @@ -3,9 +3,7 @@ * By rejas * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ modules: [ { module: "alert", diff --git a/tests/configs/modules/calendar/auth-default.js b/tests/configs/modules/calendar/auth-default.js index e87e2f99..cad5d51b 100644 --- a/tests/configs/modules/calendar/auth-default.js +++ b/tests/configs/modules/calendar/auth-default.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/basic-auth.js b/tests/configs/modules/calendar/basic-auth.js index b62739c0..be0e530e 100644 --- a/tests/configs/modules/calendar/basic-auth.js +++ b/tests/configs/modules/calendar/basic-auth.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/changed-port.js b/tests/configs/modules/calendar/changed-port.js index e0c70d75..022849be 100644 --- a/tests/configs/modules/calendar/changed-port.js +++ b/tests/configs/modules/calendar/changed-port.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/custom.js b/tests/configs/modules/calendar/custom.js index 5a289fe0..80d9dc5f 100644 --- a/tests/configs/modules/calendar/custom.js +++ b/tests/configs/modules/calendar/custom.js @@ -3,9 +3,7 @@ * By Rejas * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/default.js b/tests/configs/modules/calendar/default.js index 40801e9a..1a0c6ae7 100644 --- a/tests/configs/modules/calendar/default.js +++ b/tests/configs/modules/calendar/default.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/fail-basic-auth.js b/tests/configs/modules/calendar/fail-basic-auth.js index 16bbaa92..a1c1bd33 100644 --- a/tests/configs/modules/calendar/fail-basic-auth.js +++ b/tests/configs/modules/calendar/fail-basic-auth.js @@ -5,9 +5,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/old-basic-auth.js b/tests/configs/modules/calendar/old-basic-auth.js index b7688557..23d06159 100644 --- a/tests/configs/modules/calendar/old-basic-auth.js +++ b/tests/configs/modules/calendar/old-basic-auth.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/recurring.js b/tests/configs/modules/calendar/recurring.js index 6e361081..935aacaf 100644 --- a/tests/configs/modules/calendar/recurring.js +++ b/tests/configs/modules/calendar/recurring.js @@ -3,9 +3,7 @@ * By Rejas * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/clock_12hr.js b/tests/configs/modules/clock/clock_12hr.js index 3dc815a1..85302aa2 100644 --- a/tests/configs/modules/clock/clock_12hr.js +++ b/tests/configs/modules/clock/clock_12hr.js @@ -3,9 +3,7 @@ * By Sergey Morozov * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js index 7b9c2479..819f1b5b 100644 --- a/tests/configs/modules/clock/clock_24hr.js +++ b/tests/configs/modules/clock/clock_24hr.js @@ -3,9 +3,7 @@ * By Sergey Morozov * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ modules: [ { module: "clock", diff --git a/tests/configs/modules/clock/clock_analog.js b/tests/configs/modules/clock/clock_analog.js index 34cae41d..c5053202 100644 --- a/tests/configs/modules/clock/clock_analog.js +++ b/tests/configs/modules/clock/clock_analog.js @@ -2,9 +2,7 @@ * * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ modules: [ { module: "clock", diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js index 19ebcc99..86b09185 100644 --- a/tests/configs/modules/clock/clock_displaySeconds_false.js +++ b/tests/configs/modules/clock/clock_displaySeconds_false.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js index 7275c8aa..ea5179c5 100644 --- a/tests/configs/modules/clock/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/clock_showPeriodUpper.js @@ -3,9 +3,7 @@ * By Sergey Morozov * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js index 5519d3f7..81a71cde 100644 --- a/tests/configs/modules/clock/clock_showWeek.js +++ b/tests/configs/modules/clock/clock_showWeek.js @@ -3,9 +3,7 @@ * By Johan Hammar * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js index adf430c0..c4f5bc68 100644 --- a/tests/configs/modules/clock/es/clock_12hr.js +++ b/tests/configs/modules/clock/es/clock_12hr.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../../default.js"); - -const config = configFacory({ +const config = require("../../../default.js").configFactory({ language: "es", timeFormat: 12, diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js index a5772341..21ab1559 100644 --- a/tests/configs/modules/clock/es/clock_24hr.js +++ b/tests/configs/modules/clock/es/clock_24hr.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../../default.js"); - -const config = configFacory({ +const config = require("../../../default.js").configFactory({ language: "es", modules: [ diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js index e432ff91..804626c3 100644 --- a/tests/configs/modules/clock/es/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/es/clock_showPeriodUpper.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../../default.js"); - -const config = configFacory({ +const config = require("../../../default.js").configFactory({ language: "es", timeFormat: 12, diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js index 71b16e15..c9c03804 100644 --- a/tests/configs/modules/clock/es/clock_showWeek.js +++ b/tests/configs/modules/clock/es/clock_showWeek.js @@ -4,9 +4,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../../default.js"); - -const config = configFacory({ +const config = require("../../../default.js").configFactory({ language: "es", timeFormat: 12, diff --git a/tests/configs/modules/compliments/compliments_anytime.js b/tests/configs/modules/compliments/compliments_anytime.js index 7f12efe2..2b7d479a 100644 --- a/tests/configs/modules/compliments/compliments_anytime.js +++ b/tests/configs/modules/compliments/compliments_anytime.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/compliments/compliments_date.js b/tests/configs/modules/compliments/compliments_date.js index 1dfb2512..287dac3c 100644 --- a/tests/configs/modules/compliments/compliments_date.js +++ b/tests/configs/modules/compliments/compliments_date.js @@ -3,9 +3,7 @@ * By Rejas * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/compliments/compliments_only_anytime.js b/tests/configs/modules/compliments/compliments_only_anytime.js index ea1eab13..d9d4a45a 100644 --- a/tests/configs/modules/compliments/compliments_only_anytime.js +++ b/tests/configs/modules/compliments/compliments_only_anytime.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js index cf7dfa97..198f2ace 100644 --- a/tests/configs/modules/compliments/compliments_parts_day.js +++ b/tests/configs/modules/compliments/compliments_parts_day.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/display.js b/tests/configs/modules/display.js index c7684cd2..02abc72d 100644 --- a/tests/configs/modules/display.js +++ b/tests/configs/modules/display.js @@ -3,9 +3,7 @@ * By Rejas * MIT Licensed. */ -const configFactory = require("../default.js"); - -let config = configFacory({ +let config = require("../default.js").configFactory({ modules: [ { module: "helloworld", diff --git a/tests/configs/modules/helloworld/helloworld.js b/tests/configs/modules/helloworld/helloworld.js index 8525ee62..4713fce9 100644 --- a/tests/configs/modules/helloworld/helloworld.js +++ b/tests/configs/modules/helloworld/helloworld.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ modules: [ { module: "helloworld", diff --git a/tests/configs/modules/helloworld/helloworld_default.js b/tests/configs/modules/helloworld/helloworld_default.js index 7c656fb9..5087a01b 100644 --- a/tests/configs/modules/helloworld/helloworld_default.js +++ b/tests/configs/modules/helloworld/helloworld_default.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ modules: [ { module: "helloworld", diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js index 958e65f4..9a469609 100644 --- a/tests/configs/modules/newsfeed/default.js +++ b/tests/configs/modules/newsfeed/default.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/newsfeed/incorrect_url.js b/tests/configs/modules/newsfeed/incorrect_url.js index 058a4b6b..63fc2c4d 100644 --- a/tests/configs/modules/newsfeed/incorrect_url.js +++ b/tests/configs/modules/newsfeed/incorrect_url.js @@ -2,9 +2,7 @@ * * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/newsfeed/prohibited_words.js b/tests/configs/modules/newsfeed/prohibited_words.js index 68c69f10..ef23c047 100644 --- a/tests/configs/modules/newsfeed/prohibited_words.js +++ b/tests/configs/modules/newsfeed/prohibited_words.js @@ -2,9 +2,7 @@ * * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js index 9a9fd441..d12f1619 100644 --- a/tests/configs/modules/positions.js +++ b/tests/configs/modules/positions.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("../default.js"); - -const config = configFacory({ +const config = require("../default.js").configFactory({ modules: // Using exotic content. This is why don't accept go to JSON configuration file (function () { diff --git a/tests/configs/modules/weather/currentweather_compliments.js b/tests/configs/modules/weather/currentweather_compliments.js index 8a96c6b1..cef5539b 100644 --- a/tests/configs/modules/weather/currentweather_compliments.js +++ b/tests/configs/modules/weather/currentweather_compliments.js @@ -3,9 +3,7 @@ * By rejas https://github.com/rejas * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ modules: [ { module: "compliments", diff --git a/tests/configs/modules/weather/currentweather_default.js b/tests/configs/modules/weather/currentweather_default.js index 02208ec4..66eb4db3 100644 --- a/tests/configs/modules/weather/currentweather_default.js +++ b/tests/configs/modules/weather/currentweather_default.js @@ -3,9 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js index 0bbf32b6..c9d18f83 100644 --- a/tests/configs/modules/weather/currentweather_options.js +++ b/tests/configs/modules/weather/currentweather_options.js @@ -3,9 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ modules: [ { module: "weather", diff --git a/tests/configs/modules/weather/currentweather_units.js b/tests/configs/modules/weather/currentweather_units.js index 236061ef..1dade633 100644 --- a/tests/configs/modules/weather/currentweather_units.js +++ b/tests/configs/modules/weather/currentweather_units.js @@ -3,9 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ units: "imperial", modules: [ diff --git a/tests/configs/modules/weather/forecastweather_default.js b/tests/configs/modules/weather/forecastweather_default.js index e3a725d7..eac9dd0c 100644 --- a/tests/configs/modules/weather/forecastweather_default.js +++ b/tests/configs/modules/weather/forecastweather_default.js @@ -3,9 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/weather/forecastweather_options.js b/tests/configs/modules/weather/forecastweather_options.js index 616ef626..0a1daa00 100644 --- a/tests/configs/modules/weather/forecastweather_options.js +++ b/tests/configs/modules/weather/forecastweather_options.js @@ -3,9 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/weather/forecastweather_units.js b/tests/configs/modules/weather/forecastweather_units.js index 2a9785cd..6ff79d98 100644 --- a/tests/configs/modules/weather/forecastweather_units.js +++ b/tests/configs/modules/weather/forecastweather_units.js @@ -3,9 +3,7 @@ * By rejas * MIT Licensed. */ -const configFactory = require("../../default.js"); - -const config = configFacory({ +const config = require("../../default.js").configFactory({ units: "imperial", modules: [ diff --git a/tests/configs/noIpWhiteList.js b/tests/configs/noIpWhiteList.js index f9d3698e..3f515a6e 100644 --- a/tests/configs/noIpWhiteList.js +++ b/tests/configs/noIpWhiteList.js @@ -3,8 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = require("./default.js"); -config.ipWhitelist = ["x.x.x.x"]; +const config = require("./default.js").configFactory({ + ipWhitelist: ["x.x.x.x"] +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/port_8090.js b/tests/configs/port_8090.js index 400a54e1..f7aaacac 100644 --- a/tests/configs/port_8090.js +++ b/tests/configs/port_8090.js @@ -3,8 +3,9 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -let config = require("./default.js"); -config.port = 8090; +const config = require("./default.js").configFactory({ + port: 8090 +}); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js index 198f857d..f531d137 100644 --- a/tests/configs/without_modules.js +++ b/tests/configs/without_modules.js @@ -3,9 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const configFactory = require("./default.js"); - -const config = configFacory({ +const config = require("./default.js").configFactory({ ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"] }); diff --git a/tests/e2e/dev_console.js b/tests/e2e/dev_console.js index 06470645..2a607e5b 100644 --- a/tests/e2e/dev_console.js +++ b/tests/e2e/dev_console.js @@ -7,7 +7,7 @@ describe("Development console tests", function () { beforeAll(function () { // Set config sample for use in test - process.env.MM_CONFIG_FILE = "tests/configs/default.js"; + process.env.MM_CONFIG_FILE = "tests/configs/env.js"; }); describe("Without 'dev' commandline argument", function () { diff --git a/tests/e2e/env_spec.js b/tests/e2e/env_spec.js index 77605b4a..706274a2 100644 --- a/tests/e2e/env_spec.js +++ b/tests/e2e/env_spec.js @@ -8,7 +8,7 @@ describe("Electron app environment", function () { beforeAll(function () { // Set config sample for use in test - process.env.MM_CONFIG_FILE = "tests/configs/default.js"; + process.env.MM_CONFIG_FILE = "tests/configs/env.js"; }); beforeEach(function () { diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js index 3c97515d..b5289c2f 100644 --- a/tests/e2e/vendor_spec.js +++ b/tests/e2e/vendor_spec.js @@ -10,7 +10,7 @@ describe("Vendors", function () { let app = null; beforeAll(function () { - process.env.MM_CONFIG_FILE = "tests/configs/default.js"; + process.env.MM_CONFIG_FILE = "tests/configs/env.js"; return helpers .startApplication({ args: ["js/electron.js"] From e75e4e228413f7c030aa7804064bafac78fc0bcd Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Tue, 13 Jul 2021 23:39:55 +0200 Subject: [PATCH 9/9] use process.cwd() for correct path --- tests/configs/default.js | 33 ++++++++++--------- tests/configs/empty_ipWhiteList.js | 2 +- tests/configs/env.js | 2 +- tests/configs/modules/alert/default.js | 2 +- .../configs/modules/calendar/auth-default.js | 2 +- tests/configs/modules/calendar/basic-auth.js | 2 +- .../configs/modules/calendar/changed-port.js | 2 +- tests/configs/modules/calendar/custom.js | 2 +- tests/configs/modules/calendar/default.js | 2 +- .../modules/calendar/fail-basic-auth.js | 2 +- .../modules/calendar/old-basic-auth.js | 2 +- tests/configs/modules/calendar/recurring.js | 2 +- tests/configs/modules/clock/clock_12hr.js | 2 +- tests/configs/modules/clock/clock_24hr.js | 2 +- tests/configs/modules/clock/clock_analog.js | 2 +- .../clock/clock_displaySeconds_false.js | 2 +- .../modules/clock/clock_showPeriodUpper.js | 2 +- tests/configs/modules/clock/clock_showWeek.js | 2 +- tests/configs/modules/clock/es/clock_12hr.js | 2 +- tests/configs/modules/clock/es/clock_24hr.js | 2 +- .../modules/clock/es/clock_showPeriodUpper.js | 2 +- .../modules/clock/es/clock_showWeek.js | 2 +- .../compliments/compliments_anytime.js | 2 +- .../modules/compliments/compliments_date.js | 2 +- .../compliments/compliments_only_anytime.js | 2 +- .../compliments/compliments_parts_day.js | 2 +- tests/configs/modules/display.js | 2 +- .../configs/modules/helloworld/helloworld.js | 2 +- .../modules/helloworld/helloworld_default.js | 2 +- tests/configs/modules/newsfeed/default.js | 2 +- .../configs/modules/newsfeed/incorrect_url.js | 2 +- .../modules/newsfeed/prohibited_words.js | 2 +- tests/configs/modules/positions.js | 2 +- .../weather/currentweather_compliments.js | 2 +- .../modules/weather/currentweather_default.js | 2 +- .../modules/weather/currentweather_options.js | 2 +- .../modules/weather/currentweather_units.js | 2 +- .../weather/forecastweather_default.js | 2 +- .../weather/forecastweather_options.js | 2 +- .../modules/weather/forecastweather_units.js | 2 +- tests/configs/noIpWhiteList.js | 2 +- tests/configs/port_8090.js | 2 +- tests/configs/without_modules.js | 3 +- 43 files changed, 61 insertions(+), 57 deletions(-) diff --git a/tests/configs/default.js b/tests/configs/default.js index 030769eb..e3236318 100644 --- a/tests/configs/default.js +++ b/tests/configs/default.js @@ -4,21 +4,24 @@ * MIT Licensed. */ exports.configFactory = function (options) { - return Object.assign({ - port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], + return Object.assign( + { + port: 8080, + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], - language: "en", - timeFormat: 24, - units: "metric", - electronOptions: { - webPreferences: { - nodeIntegration: true, - enableRemoteModule: true, - contextIsolation: false - } + language: "en", + timeFormat: 24, + units: "metric", + electronOptions: { + webPreferences: { + nodeIntegration: true, + enableRemoteModule: true, + contextIsolation: false + } + }, + + modules: [] }, - - modules: [] - }, options); + options + ); }; diff --git a/tests/configs/empty_ipWhiteList.js b/tests/configs/empty_ipWhiteList.js index e2826e93..cdf637c5 100644 --- a/tests/configs/empty_ipWhiteList.js +++ b/tests/configs/empty_ipWhiteList.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("./default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ ipWhitelist: [] }); diff --git a/tests/configs/env.js b/tests/configs/env.js index 5673d988..a2d81f67 100644 --- a/tests/configs/env.js +++ b/tests/configs/env.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("./default.js").configFactory(); +let config = require(process.cwd() + "/tests/configs/default.js").configFactory(); /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") { diff --git a/tests/configs/modules/alert/default.js b/tests/configs/modules/alert/default.js index 423e9462..b75a41f8 100644 --- a/tests/configs/modules/alert/default.js +++ b/tests/configs/modules/alert/default.js @@ -3,7 +3,7 @@ * By rejas * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ modules: [ { module: "alert", diff --git a/tests/configs/modules/calendar/auth-default.js b/tests/configs/modules/calendar/auth-default.js index cad5d51b..8375bfcd 100644 --- a/tests/configs/modules/calendar/auth-default.js +++ b/tests/configs/modules/calendar/auth-default.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/basic-auth.js b/tests/configs/modules/calendar/basic-auth.js index be0e530e..a1150281 100644 --- a/tests/configs/modules/calendar/basic-auth.js +++ b/tests/configs/modules/calendar/basic-auth.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/changed-port.js b/tests/configs/modules/calendar/changed-port.js index 022849be..e43feafa 100644 --- a/tests/configs/modules/calendar/changed-port.js +++ b/tests/configs/modules/calendar/changed-port.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/custom.js b/tests/configs/modules/calendar/custom.js index 80d9dc5f..16f82ea0 100644 --- a/tests/configs/modules/calendar/custom.js +++ b/tests/configs/modules/calendar/custom.js @@ -3,7 +3,7 @@ * By Rejas * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/default.js b/tests/configs/modules/calendar/default.js index 1a0c6ae7..5964b294 100644 --- a/tests/configs/modules/calendar/default.js +++ b/tests/configs/modules/calendar/default.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/fail-basic-auth.js b/tests/configs/modules/calendar/fail-basic-auth.js index a1c1bd33..54d04064 100644 --- a/tests/configs/modules/calendar/fail-basic-auth.js +++ b/tests/configs/modules/calendar/fail-basic-auth.js @@ -5,7 +5,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/old-basic-auth.js b/tests/configs/modules/calendar/old-basic-auth.js index 23d06159..06570eb1 100644 --- a/tests/configs/modules/calendar/old-basic-auth.js +++ b/tests/configs/modules/calendar/old-basic-auth.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/calendar/recurring.js b/tests/configs/modules/calendar/recurring.js index 935aacaf..879b966e 100644 --- a/tests/configs/modules/calendar/recurring.js +++ b/tests/configs/modules/calendar/recurring.js @@ -3,7 +3,7 @@ * By Rejas * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/clock_12hr.js b/tests/configs/modules/clock/clock_12hr.js index 85302aa2..35b45914 100644 --- a/tests/configs/modules/clock/clock_12hr.js +++ b/tests/configs/modules/clock/clock_12hr.js @@ -3,7 +3,7 @@ * By Sergey Morozov * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js index 819f1b5b..01b2a36b 100644 --- a/tests/configs/modules/clock/clock_24hr.js +++ b/tests/configs/modules/clock/clock_24hr.js @@ -3,7 +3,7 @@ * By Sergey Morozov * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ modules: [ { module: "clock", diff --git a/tests/configs/modules/clock/clock_analog.js b/tests/configs/modules/clock/clock_analog.js index c5053202..b33bd051 100644 --- a/tests/configs/modules/clock/clock_analog.js +++ b/tests/configs/modules/clock/clock_analog.js @@ -2,7 +2,7 @@ * * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ modules: [ { module: "clock", diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js index 86b09185..1caef7e3 100644 --- a/tests/configs/modules/clock/clock_displaySeconds_false.js +++ b/tests/configs/modules/clock/clock_displaySeconds_false.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js index ea5179c5..b069c438 100644 --- a/tests/configs/modules/clock/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/clock_showPeriodUpper.js @@ -3,7 +3,7 @@ * By Sergey Morozov * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js index 81a71cde..b595ba70 100644 --- a/tests/configs/modules/clock/clock_showWeek.js +++ b/tests/configs/modules/clock/clock_showWeek.js @@ -3,7 +3,7 @@ * By Johan Hammar * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js index c4f5bc68..addbeb9f 100644 --- a/tests/configs/modules/clock/es/clock_12hr.js +++ b/tests/configs/modules/clock/es/clock_12hr.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ language: "es", timeFormat: 12, diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js index 21ab1559..a5fe49ca 100644 --- a/tests/configs/modules/clock/es/clock_24hr.js +++ b/tests/configs/modules/clock/es/clock_24hr.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ language: "es", modules: [ diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js index 804626c3..4a5ab636 100644 --- a/tests/configs/modules/clock/es/clock_showPeriodUpper.js +++ b/tests/configs/modules/clock/es/clock_showPeriodUpper.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ language: "es", timeFormat: 12, diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js index c9c03804..b4a436a6 100644 --- a/tests/configs/modules/clock/es/clock_showWeek.js +++ b/tests/configs/modules/clock/es/clock_showWeek.js @@ -4,7 +4,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ language: "es", timeFormat: 12, diff --git a/tests/configs/modules/compliments/compliments_anytime.js b/tests/configs/modules/compliments/compliments_anytime.js index 2b7d479a..f6731edf 100644 --- a/tests/configs/modules/compliments/compliments_anytime.js +++ b/tests/configs/modules/compliments/compliments_anytime.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/compliments/compliments_date.js b/tests/configs/modules/compliments/compliments_date.js index 287dac3c..c9549816 100644 --- a/tests/configs/modules/compliments/compliments_date.js +++ b/tests/configs/modules/compliments/compliments_date.js @@ -3,7 +3,7 @@ * By Rejas * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/compliments/compliments_only_anytime.js b/tests/configs/modules/compliments/compliments_only_anytime.js index d9d4a45a..d65bc67d 100644 --- a/tests/configs/modules/compliments/compliments_only_anytime.js +++ b/tests/configs/modules/compliments/compliments_only_anytime.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js index 198f2ace..e490a710 100644 --- a/tests/configs/modules/compliments/compliments_parts_day.js +++ b/tests/configs/modules/compliments/compliments_parts_day.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/display.js b/tests/configs/modules/display.js index 02abc72d..070dc9e5 100644 --- a/tests/configs/modules/display.js +++ b/tests/configs/modules/display.js @@ -3,7 +3,7 @@ * By Rejas * MIT Licensed. */ -let config = require("../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ modules: [ { module: "helloworld", diff --git a/tests/configs/modules/helloworld/helloworld.js b/tests/configs/modules/helloworld/helloworld.js index 4713fce9..9845e4b8 100644 --- a/tests/configs/modules/helloworld/helloworld.js +++ b/tests/configs/modules/helloworld/helloworld.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ modules: [ { module: "helloworld", diff --git a/tests/configs/modules/helloworld/helloworld_default.js b/tests/configs/modules/helloworld/helloworld_default.js index 5087a01b..6400c9f7 100644 --- a/tests/configs/modules/helloworld/helloworld_default.js +++ b/tests/configs/modules/helloworld/helloworld_default.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ modules: [ { module: "helloworld", diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js index 9a469609..1a112566 100644 --- a/tests/configs/modules/newsfeed/default.js +++ b/tests/configs/modules/newsfeed/default.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/newsfeed/incorrect_url.js b/tests/configs/modules/newsfeed/incorrect_url.js index 63fc2c4d..ab126aa4 100644 --- a/tests/configs/modules/newsfeed/incorrect_url.js +++ b/tests/configs/modules/newsfeed/incorrect_url.js @@ -2,7 +2,7 @@ * * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/newsfeed/prohibited_words.js b/tests/configs/modules/newsfeed/prohibited_words.js index ef23c047..f4040557 100644 --- a/tests/configs/modules/newsfeed/prohibited_words.js +++ b/tests/configs/modules/newsfeed/prohibited_words.js @@ -2,7 +2,7 @@ * * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js index d12f1619..479775c8 100644 --- a/tests/configs/modules/positions.js +++ b/tests/configs/modules/positions.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ modules: // Using exotic content. This is why don't accept go to JSON configuration file (function () { diff --git a/tests/configs/modules/weather/currentweather_compliments.js b/tests/configs/modules/weather/currentweather_compliments.js index cef5539b..35d5ffb5 100644 --- a/tests/configs/modules/weather/currentweather_compliments.js +++ b/tests/configs/modules/weather/currentweather_compliments.js @@ -3,7 +3,7 @@ * By rejas https://github.com/rejas * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ modules: [ { module: "compliments", diff --git a/tests/configs/modules/weather/currentweather_default.js b/tests/configs/modules/weather/currentweather_default.js index 66eb4db3..5c7edd5c 100644 --- a/tests/configs/modules/weather/currentweather_default.js +++ b/tests/configs/modules/weather/currentweather_default.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js index c9d18f83..f3ff9d5d 100644 --- a/tests/configs/modules/weather/currentweather_options.js +++ b/tests/configs/modules/weather/currentweather_options.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ modules: [ { module: "weather", diff --git a/tests/configs/modules/weather/currentweather_units.js b/tests/configs/modules/weather/currentweather_units.js index 1dade633..af73d058 100644 --- a/tests/configs/modules/weather/currentweather_units.js +++ b/tests/configs/modules/weather/currentweather_units.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ units: "imperial", modules: [ diff --git a/tests/configs/modules/weather/forecastweather_default.js b/tests/configs/modules/weather/forecastweather_default.js index eac9dd0c..f4b401f6 100644 --- a/tests/configs/modules/weather/forecastweather_default.js +++ b/tests/configs/modules/weather/forecastweather_default.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/weather/forecastweather_options.js b/tests/configs/modules/weather/forecastweather_options.js index 0a1daa00..094d9a00 100644 --- a/tests/configs/modules/weather/forecastweather_options.js +++ b/tests/configs/modules/weather/forecastweather_options.js @@ -3,7 +3,7 @@ * By fewieden https://github.com/fewieden * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ timeFormat: 12, modules: [ diff --git a/tests/configs/modules/weather/forecastweather_units.js b/tests/configs/modules/weather/forecastweather_units.js index 6ff79d98..843f874b 100644 --- a/tests/configs/modules/weather/forecastweather_units.js +++ b/tests/configs/modules/weather/forecastweather_units.js @@ -3,7 +3,7 @@ * By rejas * MIT Licensed. */ -const config = require("../../default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ units: "imperial", modules: [ diff --git a/tests/configs/noIpWhiteList.js b/tests/configs/noIpWhiteList.js index 3f515a6e..40655480 100644 --- a/tests/configs/noIpWhiteList.js +++ b/tests/configs/noIpWhiteList.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("./default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ ipWhitelist: ["x.x.x.x"] }); diff --git a/tests/configs/port_8090.js b/tests/configs/port_8090.js index f7aaacac..7756fb76 100644 --- a/tests/configs/port_8090.js +++ b/tests/configs/port_8090.js @@ -3,7 +3,7 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("./default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ port: 8090 }); diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js index f531d137..02b767c0 100644 --- a/tests/configs/without_modules.js +++ b/tests/configs/without_modules.js @@ -3,9 +3,10 @@ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. */ -const config = require("./default.js").configFactory({ +let config = require(process.cwd() + "/tests/configs/default.js").configFactory({ ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"] }); +delete config.modules; /*************** DO NOT EDIT THE LINE BELOW ***************/ if (typeof module !== "undefined") {