kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintignore
View File

@ -1,2 +1,3 @@
modules/*
!modules/default/
!modules/default/
js/positions.js

1
CHANGELOG.md
View File

@ -40,6 +40,7 @@ _This release is scheduled to be released on 2024-10-01._
- [weather] Fixed issue for respecting unit config on broadcasted notifications
- [tests] Fixes calendar test by moving it from e2e to electron with fixed date (#3532)
- [calendar] fixed sliceMultiDayEvents getting wrong count and displaying incorrect entries, Europe/Berlin (#3542)
- [tests] ignore `js/positions.js` when linting (this file is created at runtime)
## [2.28.0] - 2024-07-01

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

4
tests/e2e/modules/newsfeed_spec.js
View File

@ -82,10 +82,10 @@ describe("Newsfeed module", () => {
});
describe("Newsfeed module located in config directory", () => {
beforeAll(async () => {
beforeAll(() => {
const baseDir = `${__dirname}/../../..`;
if (!fs.existsSync(`${baseDir}/config/newsfeed`)) {
await fs.cp(`${baseDir}/modules/default/newsfeed`, `${baseDir}/config/newsfeed`, { recursive: true }, (err) => err && console.error(err));
fs.cpSync(`${baseDir}/modules/default/newsfeed`, `${baseDir}/config/newsfeed`, { recursive: true });
}
process.env.MM_MODULES_DIR = "config";
});