kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

factory again

Browse Source
This commit is contained in:
Karsten Hassel 2021-07-05 19:57:04 +02:00
parent 209e049893
commit 9aa0af4f9c
46 changed files with 77 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/configs/default.js
View File

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

5
tests/configs/empty_ipWhiteList.js
View File

@ -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") {

11
tests/configs/env.js Normal file
View File

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

4
tests/configs/modules/alert/default.js
View File

@ -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",

4
tests/configs/modules/calendar/auth-default.js
View File

@ -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: [

4
tests/configs/modules/calendar/basic-auth.js
View File

@ -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: [

4
tests/configs/modules/calendar/changed-port.js
View File

@ -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: [

4
tests/configs/modules/calendar/custom.js
View File

@ -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: [

4
tests/configs/modules/calendar/default.js
View File

@ -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: [

4
tests/configs/modules/calendar/fail-basic-auth.js
View File

@ -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: [

4
tests/configs/modules/calendar/old-basic-auth.js
View File

@ -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: [

4
tests/configs/modules/calendar/recurring.js
View File

@ -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: [

4
tests/configs/modules/clock/clock_12hr.js
View File

@ -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: [

4
tests/configs/modules/clock/clock_24hr.js
View File

@ -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",

4
tests/configs/modules/clock/clock_analog.js
View File

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

4
tests/configs/modules/clock/clock_displaySeconds_false.js
View File

@ -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: [

4
tests/configs/modules/clock/clock_showPeriodUpper.js
View File

@ -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: [

4
tests/configs/modules/clock/clock_showWeek.js
View File

@ -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: [

4
tests/configs/modules/clock/es/clock_12hr.js
View File

@ -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,

4
tests/configs/modules/clock/es/clock_24hr.js
View File

@ -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: [

4
tests/configs/modules/clock/es/clock_showPeriodUpper.js
View File

@ -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,

4
tests/configs/modules/clock/es/clock_showWeek.js
View File

@ -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,

4
tests/configs/modules/compliments/compliments_anytime.js
View File

@ -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: [

4
tests/configs/modules/compliments/compliments_date.js
View File

@ -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: [

4
tests/configs/modules/compliments/compliments_only_anytime.js
View File

@ -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: [

4
tests/configs/modules/compliments/compliments_parts_day.js
View File

@ -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: [

4
tests/configs/modules/display.js
View File

@ -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",

4
tests/configs/modules/helloworld/helloworld.js
View File

@ -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",

4
tests/configs/modules/helloworld/helloworld_default.js
View File

@ -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",

4
tests/configs/modules/newsfeed/default.js
View File

@ -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: [

4
tests/configs/modules/newsfeed/incorrect_url.js
View File

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

4
tests/configs/modules/newsfeed/prohibited_words.js
View File

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

4
tests/configs/modules/positions.js
View File

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

4
tests/configs/modules/weather/currentweather_compliments.js
View File

@ -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",

4
tests/configs/modules/weather/currentweather_default.js
View File

@ -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: [

4
tests/configs/modules/weather/currentweather_options.js
View File

@ -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",

4
tests/configs/modules/weather/currentweather_units.js
View File

@ -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: [

4
tests/configs/modules/weather/forecastweather_default.js
View File

@ -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: [

4
tests/configs/modules/weather/forecastweather_options.js
View File

@ -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: [

4
tests/configs/modules/weather/forecastweather_units.js
View File

@ -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: [

5
tests/configs/noIpWhiteList.js
View File

@ -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") {

5
tests/configs/port_8090.js
View File

@ -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") {

4
tests/configs/without_modules.js
View File

@ -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"]
});

2
tests/e2e/dev_console.js
View File

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

2
tests/e2e/env_spec.js
View File

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

2
tests/e2e/vendor_spec.js
View File

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