Skip to content

Commit

Permalink
added test for MM_MODULES_DIR (MagicMirrorOrg#3546)
Browse files Browse the repository at this point in the history
uses newsfeed test after copying this module to config dir

addition for MagicMirrorOrg#3530
  • Loading branch information
khassel authored Sep 19, 2024
1 parent 65d7e2d commit 8f5aa50
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ _This release is scheduled to be released on 2024-10-01._

- [core] Check config at every start of MagicMirror² (#3450)
- [core] Add spelling check (cspell): `npm run test:spelling` and handle spelling issues (#3544)
- [core] removed `config.paths.vendor` (could not work because `vendor` is hardcoded in `index.html`), renamed `config.paths.modules` to `config.foreignModulesDir`, added variable `MM_CUSTOMCSS_FILE` which - if set - overrides `config.customCss`, added variable `MM_MODULES_DIR` which - if set - overrides `config.foreignModulesDir` (#3530)
- [core] removed `config.paths.vendor` (could not work because `vendor` is hardcoded in `index.html`), renamed `config.paths.modules` to `config.foreignModulesDir`, added variable `MM_CUSTOMCSS_FILE` which - if set - overrides `config.customCss`, added variable `MM_MODULES_DIR` which - if set - overrides `config.foreignModulesDir`, added test for `MM_MODULES_DIR` (#3530)
- [core] elements are now removed from `index.html` when loading script or stylesheet files fails
- [core] Added `DOM_OBJECTS_UPDATED` notification each time the DOM is re-rendered via `updateDom` (#3534)

Expand Down
31 changes: 26 additions & 5 deletions tests/e2e/modules/newsfeed_spec.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
const fs = require("node:fs");
const helpers = require("../helpers/global-setup");

describe("Newsfeed module", () => {
afterAll(async () => {
await helpers.stopApplication();
});

const runTests = async () => {
describe("Default configuration", () => {
beforeAll(async () => {
await helpers.startApplication("tests/configs/modules/newsfeed/default.js");
Expand Down Expand Up @@ -74,4 +71,28 @@ describe("Newsfeed module", () => {
expect(elem.textContent).toContain("No news at the moment.");
});
});
};

describe("Newsfeed module", () => {
afterAll(async () => {
await helpers.stopApplication();
});

runTests();
});

describe("Newsfeed module located in config directory", () => {
beforeAll(async () => {
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));
}
process.env.MM_MODULES_DIR = "config";
});

afterAll(async () => {
await helpers.stopApplication();
});

runTests();
});

0 comments on commit 8f5aa50

Please sign in to comment.