mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-29 04:29:41 +00:00
fix tests
This commit is contained in:
parent
659e1da79d
commit
7cfc3458ec
@ -4,17 +4,6 @@
|
|||||||
* MIT Licensed.
|
* MIT Licensed.
|
||||||
*/
|
*/
|
||||||
let config = {
|
let config = {
|
||||||
electronOptions: {
|
|
||||||
fullscreen: false,
|
|
||||||
width: 800,
|
|
||||||
height: 600,
|
|
||||||
webPreferences: {
|
|
||||||
nodeIntegration: true,
|
|
||||||
enableRemoteModule: true,
|
|
||||||
contextIsolation: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
modules: [
|
modules: [
|
||||||
{
|
{
|
||||||
module: "helloworld",
|
module: "helloworld",
|
||||||
@ -35,6 +24,9 @@ let config = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = Object.assign(require("../default.js"), 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 ***************/
|
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
||||||
if (typeof module !== "undefined") {
|
if (typeof module !== "undefined") {
|
||||||
|
@ -3,7 +3,11 @@
|
|||||||
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
|
||||||
* MIT Licensed.
|
* 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;
|
delete config.modules;
|
||||||
|
|
||||||
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
/*************** DO NOT EDIT THE LINE BELOW ***************/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user