factory again

tests/configs/default.js

@@ -3,7 +3,8 @@
  * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
  * MIT Licensed.
  */
-let config = {
+exports.configFactory = function (options) {
+	return Object.assign({
 		port: 8080,
 		ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
 
@@ -19,9 +20,5 @@ let config = {
 		},
 
 		modules: []
+	}, options);
 };
-
-/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {
-	module.exports = config;
-}

tests/configs/empty_ipWhiteList.js

@@ -3,8 +3,9 @@
  * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
  * MIT Licensed.
  */
-let config = require("./default.js");
+const config = require("./default.js").configFactory({
-config.ipWhitelist = [];
+	ipWhitelist: []
+});
 
 /*************** DO NOT EDIT THE LINE BELOW ***************/
 if (typeof module !== "undefined") {

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;
+}

tests/configs/modules/alert/default.js

@@ -3,9 +3,7 @@
  * By rejas
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	modules: [
 		{
 			module: "alert",

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/calendar/custom.js

@@ -3,9 +3,7 @@
  * By Rejas
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/calendar/recurring.js

@@ -3,9 +3,7 @@
  * By Rejas
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/clock/clock_12hr.js

@@ -3,9 +3,7 @@
  * By Sergey Morozov
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/clock/clock_24hr.js

@@ -3,9 +3,7 @@
  * By Sergey Morozov
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	modules: [
 		{
 			module: "clock",

tests/configs/modules/clock/clock_analog.js

@@ -2,9 +2,7 @@
  *
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	modules: [
 		{
 			module: "clock",

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/clock/clock_showPeriodUpper.js

@@ -3,9 +3,7 @@
  * By Sergey Morozov
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/clock/clock_showWeek.js

@@ -3,9 +3,7 @@
  * By Johan Hammar
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../../default.js").configFactory({
-
-const config = configFacory({
 	language: "es",
 	timeFormat: 12,
 

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 = require("../../../default.js").configFactory({
-
-const config = configFacory({
 	language: "es",
 
 	modules: [

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 = require("../../../default.js").configFactory({
-
-const config = configFacory({
 	language: "es",
 	timeFormat: 12,
 

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 = require("../../../default.js").configFactory({
-
-const config = configFacory({
 	language: "es",
 	timeFormat: 12,
 

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/compliments/compliments_date.js

@@ -3,9 +3,7 @@
  * By Rejas
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/display.js

@@ -3,9 +3,7 @@
  * By Rejas
  * MIT Licensed.
  */
-const configFactory = require("../default.js");
+let config = require("../default.js").configFactory({
-
-let config = configFacory({
 	modules: [
 		{
 			module: "helloworld",

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	modules: [
 		{
 			module: "helloworld",

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	modules: [
 		{
 			module: "helloworld",

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/newsfeed/incorrect_url.js

@@ -2,9 +2,7 @@
  *
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/newsfeed/prohibited_words.js

@@ -2,9 +2,7 @@
  *
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../default.js").configFactory({
-
-const config = configFacory({
 	modules:
 		// Using exotic content. This is why don't accept go to JSON configuration file
 		(function () {

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	modules: [
 		{
 			module: "compliments",

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	modules: [
 		{
 			module: "weather",

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	units: "imperial",
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

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 = require("../../default.js").configFactory({
-
-const config = configFacory({
 	timeFormat: 12,
 
 	modules: [

tests/configs/modules/weather/forecastweather_units.js

@@ -3,9 +3,7 @@
  * By rejas
  * MIT Licensed.
  */
-const configFactory = require("../../default.js");
+const config = require("../../default.js").configFactory({
-
-const config = configFacory({
 	units: "imperial",
 
 	modules: [

tests/configs/noIpWhiteList.js

@@ -3,8 +3,9 @@
  * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
  * MIT Licensed.
  */
-let config = require("./default.js");
+const config = require("./default.js").configFactory({
-config.ipWhitelist = ["x.x.x.x"];
+	ipWhitelist: ["x.x.x.x"]
+});
 
 /*************** DO NOT EDIT THE LINE BELOW ***************/
 if (typeof module !== "undefined") {

tests/configs/port_8090.js

@@ -3,8 +3,9 @@
  * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
  * MIT Licensed.
  */
-let config = require("./default.js");
+const config = require("./default.js").configFactory({
-config.port = 8090;
+	port: 8090
+});
 
 /*************** DO NOT EDIT THE LINE BELOW ***************/
 if (typeof module !== "undefined") {

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 = require("./default.js").configFactory({
-
-const config = configFacory({
 	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"]
 });
 

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 () {

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 () {

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"]