From 9aa0af4f9c1d57bdac7f2a067d83414fd388de5f Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Mon, 5 Jul 2021 19:57:04 +0200 Subject: [PATCH] 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"]