kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-22 05:07:05 +00:00
Code Issues Projects Releases Wiki Activity

fixes for running tests for MM_MODULES_DIR (#3550)

Browse Source 
and ignore `js/positions.js` when linting (because this file is
generated at runtime).
This commit is contained in:
Karsten Hassel
2024-09-24 22:38:00 +02:00
committed by GitHub
parent fa6a7521b4
commit 08116b8e64
5 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/app.js
View File

@@ -166,7 +166,15 @@ function App () {
let moduleFolder = `${__dirname}/../${env.modulesDir}/${module}`;
if (defaultModules.includes(moduleName)) {
moduleFolder = `${__dirname}/../modules/default/${module}`;
const defaultModuleFolder = `${__dirname}/../modules/default/${module}`;
if (process.env.JEST_WORKER_ID === undefined) {
moduleFolder = defaultModuleFolder;
} else {
// running in Jest, allow defaultModules placed under moduleDir for testing
if (env.modulesDir === "modules") {
moduleFolder = defaultModuleFolder;
}
}
}
const moduleFile = `${moduleFolder}/${module}.js`;

10
js/loader.js
View File

@@ -80,7 +80,15 @@ const Loader = (function () {
let moduleFolder = `${envVars.modulesDir}/${module}`;
if (defaultModules.indexOf(moduleName) !== -1) {
moduleFolder = `modules/default/${module}`;
const defaultModuleFolder = `modules/default/${module}`;
if (window.name !== "jsdom") {
moduleFolder = defaultModuleFolder;
} else {
// running in Jest, allow defaultModules placed under moduleDir for testing
if (envVars.modulesDir === "modules") {
moduleFolder = defaultModuleFolder;
}
}
}
if (moduleData.disabled === true) {