Release 2.32.0 (#3826)

## [2.32.0] - 2025-07-01 Thanks to: @bughaver, @bugsounet, @khassel, @KristjanESPERANTO, @plebcity, @rejas, @sdetweil. > ⚠️ This release needs nodejs version `v22.14.0 or higher` ### Added - [config] Allow to change module order for final renderer (or dynamically with CSS): Feature `order` in config (#3762) - [clock] Added option 'disableNextEvent' to hide next sun event (#3769) - [clock] Implement short syntax for clock week (#3775) ### Changed - [refactor] Simplify module loading process (#3766) - Use `node --run` instead of `npm run` (#3764) and adapt `start:dev` script (#3773) - [workflow] Run linter and spellcheck with LTS node version (#3767) - [workflow] Split "Run test" step into two steps for more clarity (#3767) - [linter] Review linter setup (#3783) - Fix command to lint markdown in `CONTRIBUTING.md` - Re-activate JSDoc linting and fix linting issues - Refactor ESLint config to use `defineConfig` and `globalIgnores` - Replace `eslint-plugin-import` with `eslint-plugin-import-x` - Switch Stylelint config to flat format and simplify Stylelint scripts - [workflow] Replace Node.js version v23 with v24 (#3770) - [refactor] Replace deprecated constants `fs.F_OK` and `fs.R_OK` (#3789) - [refactor] Replace `ansis` with built-in function `util.styleText` (#3793) - [core] Integrate stuff from `vendor` and `fonts` folders into main `package.json`, simplifies install and maintaining dependencies (#3795, #3805) - [l10n] Complete translations (with the help of translation tools) (#3794) - [refactor] Refactored `calendarfetcherutils` in Calendar module to handle timezones better (#3806) - Removed as many of the date conversions as possible - Use `moment-timezone` when calculating recurring events, this will fix problems from the past with offsets and DST not being handled properly - Added some tests to test the behavior of the refactored methods to make sure the correct event dates are returned - [linter] Enable ESLint rule `no-console` and replace `console` with `Log` in some files (#3810) - [tests] Review and refactor translation tests (#3792) ### Fixed - [fix] Handle spellcheck issues (#3783) - [calendar] fix fullday event rrule until with timezone offset (#3781) - [feat] Add rule `no-undef` in config file validation to fix #3785 (#3786) - [fonts] Fix `roboto.css` to avoid error message `Unknown descriptor 'var(' in @font-face rule.` in firefox console (#3787) - [tests] Fix and refactor e2e test `Same keys` in `translations_spec.js` (#3809) - [tests] Fix e2e tests newsfeed and calendar to exit without open handles (#3817) ### Updated - [core] Update dependencies including electron to v36 (#3774, #3788, #3811, #3804, #3815, #3823) - [core] Update package type to `commonjs` - [logger] Review factory code part: use `switch/case` instead of `if/else if` (#3812) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Michael Teeuw <michael@xonaymedia.nl> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ross Younger <crazyscot@gmail.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: jkriegshauser <joshuakr@nvidia.com> Co-authored-by: illimarkangur <116028111+illimarkangur@users.noreply.github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: vppencilsharpener <tim.pray@gmail.com> Co-authored-by: veeck <michael.veeck@nebenan.de> Co-authored-by: Paranoid93 <6515818+Paranoid93@users.noreply.github.com> Co-authored-by: Brian O'Connor <btoconnor@users.noreply.github.com> Co-authored-by: WallysWellies <59727507+WallysWellies@users.noreply.github.com> Co-authored-by: Jason Stieber <jrstieber@gmail.com> Co-authored-by: jargordon <50050429+jargordon@users.noreply.github.com> Co-authored-by: Daniel <32464403+dkallen78@users.noreply.github.com> Co-authored-by: Ryan Williams <65094007+ryan-d-williams@users.noreply.github.com> Co-authored-by: Panagiotis Skias <panagiotis.skias@gmail.com> Co-authored-by: Marc Landis <dirk.rettschlag@gmail.com> Co-authored-by: HeikoGr <20295490+HeikoGr@users.noreply.github.com> Co-authored-by: Pedro Lamas <pedrolamas@gmail.com> Co-authored-by: veeck <gitkraken@veeck.de> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: DevIncomin <56730075+Developer-Incoming@users.noreply.github.com> Co-authored-by: Nathan <n8nyoung@gmail.com> Co-authored-by: mixasgr <mixasgr@users.noreply.github.com> Co-authored-by: Savvas Adamtziloglou <savvas-gr@greeklug.gr> Co-authored-by: Konstantinos <geraki@gmail.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: BugHaver <43462320+bughaver@users.noreply.github.com> Co-authored-by: BugHaver <43462320+lsaadeh@users.noreply.github.com> Co-authored-by: Koen Konst <koenspero@gmail.com> Co-authored-by: Koen Konst <c.h.konst@avisi.nl>
2025-08-21 12:55:22 +00:00 · 2025-07-01 00:10:47 +02:00
parent 8e0b8468d3
commit 62b0f7f26e
111 changed files with 5146 additions and 4227 deletions
--- a/tests/configs/default.js
+++ b/tests/configs/default.js
@@ -1,16 +1,19 @@
-exports.configFactory = (options) => {
-	return Object.assign(
-		{
-			electronOptions: {
-				webPreferences: {
-					nodeIntegration: true,
-					enableRemoteModule: true,
-					contextIsolation: false
-				}
-			},
+if (typeof exports === "object") {
+	// running in nodejs (not in browser)
+	exports.configFactory = (options) => {
+		return Object.assign(
+			{
+				electronOptions: {
+					webPreferences: {
+						nodeIntegration: true,
+						enableRemoteModule: true,
+						contextIsolation: false
+					}
+				},

-			modules: []
-		},
-		options
-	);
-};
+				modules: []
+			},
+			options
+		);
+	};
+}
--- a/tests/configs/modules/calendar/fullday_until.js
+++ b/tests/configs/modules/calendar/fullday_until.js
@@ -0,0 +1,27 @@
+let config = {
+	address: "0.0.0.0",
+	ipWhitelist: [],
+	timeFormat: 12,
+
+	modules: [
+		{
+			module: "calendar",
+			position: "bottom_bar",
+			config: {
+				hideDuplicates: false,
+				maximumEntries: 100,
+				calendars: [
+					{
+						maximumEntries: 100,
+						url: "http://localhost:8080/tests/mocks/fullday_until.ics"
+					}
+				]
+			}
+		}
+	]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+	module.exports = config;
+}
--- a/tests/configs/modules/clock/clock_showSunNoEvent.js
+++ b/tests/configs/modules/clock/clock_showSunNoEvent.js
@@ -0,0 +1,20 @@
+let config = {
+	address: "0.0.0.0",
+	ipWhitelist: [],
+	timeFormat: 12,
+
+	modules: [
+		{
+			module: "clock",
+			position: "middle_center",
+			config: {
+				showSunTimes: "disableNextEvent"
+			}
+		}
+	]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+	module.exports = config;
+}
--- a/tests/configs/modules/clock/clock_showWeek_short.js
+++ b/tests/configs/modules/clock/clock_showWeek_short.js
@@ -0,0 +1,20 @@
+let config = {
+	address: "0.0.0.0",
+	ipWhitelist: [],
+	timeFormat: 12,
+
+	modules: [
+		{
+			module: "clock",
+			position: "middle_center",
+			config: {
+				showWeek: "short"
+			}
+		}
+	]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+	module.exports = config;
+}
--- a/tests/configs/modules/clock/de/clock_showWeek.js
+++ b/tests/configs/modules/clock/de/clock_showWeek.js
@@ -0,0 +1,21 @@
+let config = {
+	address: "0.0.0.0",
+	ipWhitelist: [],
+	language: "de",
+	timeFormat: 12,
+
+	modules: [
+		{
+			module: "clock",
+			position: "middle_center",
+			config: {
+				showWeek: true
+			}
+		}
+	]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+	module.exports = config;
+}
--- a/tests/configs/modules/clock/de/clock_showWeek_short.js
+++ b/tests/configs/modules/clock/de/clock_showWeek_short.js
@@ -0,0 +1,21 @@
+let config = {
+	address: "0.0.0.0",
+	ipWhitelist: [],
+	language: "de",
+	timeFormat: 12,
+
+	modules: [
+		{
+			module: "clock",
+			position: "middle_center",
+			config: {
+				showWeek: "short"
+			}
+		}
+	]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+	module.exports = config;
+}
--- a/tests/configs/modules/clock/es/clock_showWeek_short.js
+++ b/tests/configs/modules/clock/es/clock_showWeek_short.js
@@ -0,0 +1,21 @@
+let config = {
+	address: "0.0.0.0",
+	ipWhitelist: [],
+	language: "es",
+	timeFormat: 12,
+
+	modules: [
+		{
+			module: "clock",
+			position: "middle_center",
+			config: {
+				showWeek: "short"
+			}
+		}
+	]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+	module.exports = config;
+}
--- a/tests/e2e/animateCSS_spec.js
+++ b/tests/e2e/animateCSS_spec.js
@@ -23,18 +23,18 @@ describe("AnimateCSS integration Test", () => {
 		let styles = window.getComputedStyle(elem);

 		if (animationIn && animationIn !== "") {
-			expect(styles._values["animation-name"]).toBe(animationIn);
+			expect(styles._values.get("animation-name")).toBe(animationIn);
 		} else {
-			expect(styles._values["animation-name"]).toBeUndefined();
+			expect(styles._values.get("animation-name")).toBeUndefined();
 		}

 		if (animationOut && animationOut !== "") {
 			elem = await helpers.waitForElement(`.compliments.animate__animated.animate__${animationOut}`);
 			expect(elem).not.toBeNull();
 			styles = window.getComputedStyle(elem);
-			expect(styles._values["animation-name"]).toBe(animationOut);
+			expect(styles._values.get("animation-name")).toBe(animationOut);
 		} else {
-			expect(styles._values["animation-name"]).toBeUndefined();
+			expect(styles._values.get("animation-name")).toBeUndefined();
 		}
 		return true;
 	};
--- a/tests/e2e/fonts_spec.js
+++ b/tests/e2e/fonts_spec.js
@@ -3,7 +3,7 @@ const helpers = require("./helpers/global-setup");
 describe("All font files from roboto.css should be downloadable", () => {
 	const fontFiles = [];
 	// Statements below filters out all 'url' lines in the CSS file
-	const fileContent = require("node:fs").readFileSync(`${__dirname}/../../fonts/roboto.css`, "utf8");
+	const fileContent = require("node:fs").readFileSync(`${__dirname}/../../css/roboto.css`, "utf8");
 	const regex = /\burl\(['"]([^'"]+)['"]\)/g;
 	let match = regex.exec(fileContent);
 	while (match !== null) {
--- a/tests/e2e/helpers/global-setup.js
+++ b/tests/e2e/helpers/global-setup.js
@@ -27,13 +27,21 @@ exports.startApplication = async (configFilename, exec) => {
 		process.env.MM_CONFIG_FILE = configFilename;
 	}
 	process.env.mmTestMode = "true";
+	process.setMaxListeners(0);
 	if (exec) exec;
 	global.app = require("../../../js/app");

 	return global.app.start();
 };

-exports.stopApplication = async () => {
+exports.stopApplication = async (waitTime = 1000) => {
+	if (global.window) {
+		// no closing causes jest errors and memory leaks
+		global.window.close();
+		delete global.window;
+		// give above closing some extra time to finish
+		await new Promise((resolve) => setTimeout(resolve, waitTime));
+	}
 	if (!global.app) {
 		return Promise.resolve();
 	}
--- a/tests/e2e/helpers/mock-console.js
+++ b/tests/e2e/helpers/mock-console.js
@@ -1,29 +0,0 @@
-/**
- * Suppresses errors concerning web server already shut down.
- * @param {string} err The error message.
- */
-const mockError = (err) => {
-	if (
-		err.includes("ECONNREFUSED")
-		|| err.includes("ECONNRESET")
-		|| err.includes("socket hang up")
-		|| err.includes("exports is not defined")
-		|| err.includes("module is not defined")
-		|| err.includes("write EPIPE")
-		|| err.includes("AggregateError")
-		|| err.includes("ERR_SOCKET_CONNECTION_TIMEOUT")
-	) {
-		jest.fn();
-	} else {
-		console.dir(err);
-	}
-};
-
-global.console = {
-	log: jest.fn(),
-	dir: console.dir,
-	error: mockError,
-	warn: console.warn,
-	info: jest.fn(),
-	debug: console.debug
-};
--- a/tests/e2e/modules/calendar_spec.js
+++ b/tests/e2e/modules/calendar_spec.js
@@ -119,7 +119,6 @@ describe("Calendar module", () => {
 		});
 	});

-	process.setMaxListeners(0);
 	for (let i = -12; i < 12; i++) {
 		describe("Recurring event per timezone", () => {
 			beforeAll(async () => {
--- a/tests/e2e/modules/clock_de_spec.js
+++ b/tests/e2e/modules/clock_de_spec.js
@@ -0,0 +1,31 @@
+const helpers = require("../helpers/global-setup");
+
+describe("Clock set to german language module", () => {
+	afterAll(async () => {
+		await helpers.stopApplication();
+	});
+
+	describe("with showWeek config enabled", () => {
+		beforeAll(async () => {
+			await helpers.startApplication("tests/configs/modules/clock/de/clock_showWeek.js");
+			await helpers.getDocument();
+		});
+
+		it("shows week with correct format", async () => {
+			const weekRegex = /^[0-9]{1,2}. Kalenderwoche$/;
+			await expect(helpers.testMatch(".clock .week", weekRegex)).resolves.toBe(true);
+		});
+	});
+
+	describe("with showWeek short config enabled", () => {
+		beforeAll(async () => {
+			await helpers.startApplication("tests/configs/modules/clock/de/clock_showWeek_short.js");
+			await helpers.getDocument();
+		});
+
+		it("shows week with correct format", async () => {
+			const weekRegex = /^[0-9]{1,2}KW$/;
+			await expect(helpers.testMatch(".clock .week", weekRegex)).resolves.toBe(true);
+		});
+	});
+});
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -62,4 +62,16 @@ describe("Clock set to spanish language module", () => {
 			await expect(helpers.testMatch(".clock .week", weekRegex)).resolves.toBe(true);
 		});
 	});
+
+	describe("with showWeek short config enabled", () => {
+		beforeAll(async () => {
+			await helpers.startApplication("tests/configs/modules/clock/es/clock_showWeek_short.js");
+			await helpers.getDocument();
+		});
+
+		it("shows week with correct format", async () => {
+			const weekRegex = /^S[0-9]{1,2}$/;
+			await expect(helpers.testMatch(".clock .week", weekRegex)).resolves.toBe(true);
+		});
+	});
 });
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -40,9 +40,9 @@ describe("Clock module", () => {
 		});

 		it("check for discreet elements of clock", async () => {
-			let elemClock = helpers.waitForElement(".clock-hour-digital");
+			let elemClock = await helpers.waitForElement(".clock-hour-digital");
 			await expect(elemClock).not.toBeNull();
-			elemClock = helpers.waitForElement(".clock-minute-digital");
+			elemClock = await helpers.waitForElement(".clock-minute-digital");
 			await expect(elemClock).not.toBeNull();
 		});
 	});
@@ -92,6 +92,9 @@ describe("Clock module", () => {
 		it("should show the sun times", async () => {
 			const elem = await helpers.waitForElement(".clock .digital .sun");
 			expect(elem).not.toBeNull();
+
+			const elem2 = await helpers.waitForElement(".clock .digital .sun .fas.fa-sun");
+			expect(elem2).not.toBeNull();
 		});

 		it("should show the moon times", async () => {
@@ -100,6 +103,21 @@ describe("Clock module", () => {
 		});
 	});

+	describe("with showSunNextEvent disabled", () => {
+		beforeAll(async () => {
+			await helpers.startApplication("tests/configs/modules/clock/clock_showSunNoEvent.js");
+			await helpers.getDocument();
+		});
+
+		it("should show the sun times", async () => {
+			const elem = await helpers.waitForElement(".clock .digital .sun");
+			expect(elem).not.toBeNull();
+
+			const elem2 = document.querySelector(".clock .digital .sun .fas.fa-sun");
+			expect(elem2).toBeNull();
+		});
+	});
+
 	describe("with showWeek config enabled", () => {
 		beforeAll(async () => {
 			await helpers.startApplication("tests/configs/modules/clock/clock_showWeek.js");
@@ -120,6 +138,26 @@ describe("Clock module", () => {
 		});
 	});

+	describe("with showWeek short config enabled", () => {
+		beforeAll(async () => {
+			await helpers.startApplication("tests/configs/modules/clock/clock_showWeek_short.js");
+			await helpers.getDocument();
+		});
+
+		it("should show the week in the correct format", async () => {
+			const weekRegex = /^W[0-9]{1,2}$/;
+			await expect(helpers.testMatch(".clock .week", weekRegex)).resolves.toBe(true);
+		});
+
+		it("should show the week with the correct number of week of year", async () => {
+			const currentWeekNumber = moment().week();
+			const weekToShow = `W${currentWeekNumber}`;
+			const elem = await helpers.waitForElement(".clock .week");
+			expect(elem).not.toBeNull();
+			expect(elem.textContent).toBe(weekToShow);
+		});
+	});
+
 	describe("with analog clock face enabled", () => {
 		beforeAll(async () => {
 			await helpers.startApplication("tests/configs/modules/clock/clock_analog.js");
@@ -127,7 +165,7 @@ describe("Clock module", () => {
 		});

 		it("should show the analog clock face", async () => {
-			const elem = helpers.waitForElement(".clock-circle");
+			const elem = await helpers.waitForElement(".clock-circle");
 			expect(elem).not.toBeNull();
 		});
 	});
@@ -139,9 +177,9 @@ describe("Clock module", () => {
 		});

 		it("should show the analog clock face and the date", async () => {
-			const elemClock = helpers.waitForElement(".clock-circle");
+			const elemClock = await helpers.waitForElement(".clock-circle");
 			await expect(elemClock).not.toBeNull();
-			const elemDate = helpers.waitForElement(".clock .date");
+			const elemDate = await helpers.waitForElement(".clock .date");
 			await expect(elemDate).not.toBeNull();
 		});
 	});
--- a/tests/e2e/modules/newsfeed_spec.js
+++ b/tests/e2e/modules/newsfeed_spec.js
@@ -84,9 +84,7 @@ describe("Newsfeed module", () => {
 describe("Newsfeed module located in config directory", () => {
 	beforeAll(() => {
 		const baseDir = `${__dirname}/../../..`;
-		if (!fs.existsSync(`${baseDir}/config/newsfeed`)) {
-			fs.cpSync(`${baseDir}/modules/default/newsfeed`, `${baseDir}/config/newsfeed`, { recursive: true });
-		}
+		fs.cpSync(`${baseDir}/modules/default/newsfeed`, `${baseDir}/config/newsfeed`, { recursive: true });
 		process.env.MM_MODULES_DIR = "config";
 	});

--- a/tests/e2e/translations_spec.js
+++ b/tests/e2e/translations_spec.js
@@ -6,7 +6,7 @@ const express = require("express");
 const sinon = require("sinon");
 const translations = require("../../translations/translations");

-describe("Translations", () => {
+describe("translations", () => {
 	let server;

 	beforeAll(() => {
@@ -26,8 +26,9 @@ describe("Translations", () => {
 	});

 	it("should have a translation file in the specified path", () => {
-		for (let language in translations) {
+		for (const language in translations) {
 			const file = fs.statSync(translations[language]);
+
 			expect(file.isFile()).toBe(true);
 		}
 	});
@@ -36,90 +37,91 @@ describe("Translations", () => {
 		let dom;

 		beforeEach(() => {
-			dom = new JSDOM(
-				`<script>var Translator = {}; var Log = {log: () => {}}; var config = {language: 'de'};</script>\
-					<script src="file://${path.join(__dirname, "..", "..", "js", "class.js")}"></script>\
-					<script src="file://${path.join(__dirname, "..", "..", "js", "module.js")}"></script>`,
-				{ runScripts: "dangerously", resources: "usable" }
-			);
+			// Create a new JSDOM instance for each test
+			dom = new JSDOM("", { runScripts: "dangerously", resources: "usable" });
+
+			// Mock the necessary global objects
+			dom.window.Log = { log: jest.fn(), error: jest.fn() };
+			dom.window.Translator = {};
+			dom.window.config = { language: "de" };
+
+			// Load class.js and module.js content directly
+			const classJs = fs.readFileSync(path.join(__dirname, "..", "..", "js", "class.js"), "utf-8");
+			const moduleJs = fs.readFileSync(path.join(__dirname, "..", "..", "js", "module.js"), "utf-8");
+
+			// Execute the scripts in the JSDOM context
+			dom.window.eval(classJs);
+			dom.window.eval(moduleJs);
 		});

-		it("should load translation file", () => {
-			return new Promise((done) => {
-				dom.window.onload = async () => {
-					const { Translator, Module, config } = dom.window;
-					config.language = "en";
-					Translator.load = sinon.stub().callsFake((_m, _f, _fb) => null);
-
-					Module.register("name", { getTranslations: () => translations });
-					const MMM = Module.create("name");
-
-					await MMM.loadTranslations();
-
-					expect(Translator.load.args).toHaveLength(1);
-					expect(Translator.load.calledWith(MMM, "translations/en.json", false)).toBe(true);
-
-					done();
-				};
+		it("should load translation file", async () => {
+			await new Promise((resolve) => {
+				dom.window.onload = resolve;
 			});
+
+			const { Translator, Module, config } = dom.window;
+			config.language = "en";
+			Translator.load = sinon.stub().callsFake((_m, _f, _fb) => null);
+
+			Module.register("name", { getTranslations: () => translations });
+			const MMM = Module.create("name");
+
+			await MMM.loadTranslations();
+
+			expect(Translator.load.args).toHaveLength(1);
+			expect(Translator.load.calledWith(MMM, "translations/en.json", false)).toBe(true);
 		});

-		it("should load translation + fallback file", () => {
-			return new Promise((done) => {
-				dom.window.onload = async () => {
-					const { Translator, Module } = dom.window;
-					Translator.load = sinon.stub().callsFake((_m, _f, _fb) => null);
-
-					Module.register("name", { getTranslations: () => translations });
-					const MMM = Module.create("name");
-
-					await MMM.loadTranslations();
-
-					expect(Translator.load.args).toHaveLength(2);
-					expect(Translator.load.calledWith(MMM, "translations/de.json", false)).toBe(true);
-					expect(Translator.load.calledWith(MMM, "translations/en.json", true)).toBe(true);
-
-					done();
-				};
+		it("should load translation + fallback file", async () => {
+			await new Promise((resolve) => {
+				dom.window.onload = resolve;
 			});
+
+			const { Translator, Module } = dom.window;
+			Translator.load = sinon.stub().callsFake((_m, _f, _fb) => null);
+
+			Module.register("name", { getTranslations: () => translations });
+			const MMM = Module.create("name");
+
+			await MMM.loadTranslations();
+
+			expect(Translator.load.args).toHaveLength(2);
+			expect(Translator.load.calledWith(MMM, "translations/de.json", false)).toBe(true);
+			expect(Translator.load.calledWith(MMM, "translations/en.json", true)).toBe(true);
 		});

-		it("should load translation fallback file", () => {
-			return new Promise((done) => {
-				dom.window.onload = async () => {
-					const { Translator, Module, config } = dom.window;
-					config.language = "--";
-					Translator.load = sinon.stub().callsFake((_m, _f, _fb) => null);
-
-					Module.register("name", { getTranslations: () => translations });
-					const MMM = Module.create("name");
-
-					await MMM.loadTranslations();
-
-					expect(Translator.load.args).toHaveLength(1);
-					expect(Translator.load.calledWith(MMM, "translations/en.json", true)).toBe(true);
-
-					done();
-				};
+		it("should load translation fallback file", async () => {
+			await new Promise((resolve) => {
+				dom.window.onload = resolve;
 			});
+
+			const { Translator, Module, config } = dom.window;
+			config.language = "--";
+			Translator.load = sinon.stub().callsFake((_m, _f, _fb) => null);
+
+			Module.register("name", { getTranslations: () => translations });
+			const MMM = Module.create("name");
+
+			await MMM.loadTranslations();
+
+			expect(Translator.load.args).toHaveLength(1);
+			expect(Translator.load.calledWith(MMM, "translations/en.json", true)).toBe(true);
 		});

-		it("should load no file", () => {
-			return new Promise((done) => {
-				dom.window.onload = async () => {
-					const { Translator, Module } = dom.window;
-					Translator.load = sinon.stub();
-
-					Module.register("name", {});
-					const MMM = Module.create("name");
-
-					await MMM.loadTranslations();
-
-					expect(Translator.load.callCount).toBe(0);
-
-					done();
-				};
+		it("should load no file", async () => {
+			await new Promise((resolve) => {
+				dom.window.onload = resolve;
 			});
+
+			const { Translator, Module } = dom.window;
+			Translator.load = sinon.stub();
+
+			Module.register("name", {});
+			const MMM = Module.create("name");
+
+			await MMM.loadTranslations();
+
+			expect(Translator.load.callCount).toBe(0);
 		});
 	});

@@ -130,101 +132,103 @@ describe("Translations", () => {
 		}
 	};

-	describe("Parsing language files through the Translator class", () => {
-		for (let language in translations) {
-			it(`should parse ${language}`, () => {
-				return new Promise((done) => {
-					const dom = new JSDOM(
-						`<script>var translations = ${JSON.stringify(translations)}; var Log = {log: () => {}};</script>\
-					<script src="file://${path.join(__dirname, "..", "..", "js", "translator.js")}">`,
-						{ runScripts: "dangerously", resources: "usable" }
-					);
-					dom.window.onload = async () => {
-						const { Translator } = dom.window;
+	const translatorJs = fs.readFileSync(path.join(__dirname, "..", "..", "js", "translator.js"), "utf-8");

-						await Translator.load(mmm, translations[language], false);
-						expect(typeof Translator.translations[mmm.name]).toBe("object");
-						expect(Object.keys(Translator.translations[mmm.name]).length).toBeGreaterThanOrEqual(1);
-						done();
-					};
+	describe("parsing language files through the Translator class", () => {
+		for (const language in translations) {
+			it(`should parse ${language}`, async () => {
+				const dom = new JSDOM("", { runScripts: "dangerously", resources: "usable" });
+				dom.window.Log = { log: jest.fn() };
+				dom.window.translations = translations;
+				dom.window.eval(translatorJs);
+
+				await new Promise((resolve) => {
+					dom.window.onload = resolve;
 				});
+
+				const { Translator } = dom.window;
+				await Translator.load(mmm, translations[language], false);
+
+				expect(typeof Translator.translations[mmm.name]).toBe("object");
+				expect(Object.keys(Translator.translations[mmm.name]).length).toBeGreaterThanOrEqual(1);
 			});
 		}
 	});

-	describe("Same keys", () => {
+	describe("same keys", () => {
 		let base;
-		let missing = [];

-		beforeAll(() => {
-			return new Promise((done) => {
-				const dom = new JSDOM(
-					`<script>var translations = ${JSON.stringify(translations)}; var Log = {log: () => {}};</script>\
-					<script src="file://${path.join(__dirname, "..", "..", "js", "translator.js")}">`,
-					{ runScripts: "dangerously", resources: "usable" }
-				);
+		// Some expressions are not easy to translate automatically. For the sake of a working test, we filter them out.
+		const COMMON_EXCEPTIONS = ["WEEK_SHORT"];
+
+		// Some languages don't have certain words, so we need to filter those language specific exceptions.
+		const LANGUAGE_EXCEPTIONS = {
+			ca: ["DAYBEFOREYESTERDAY"],
+			cv: ["DAYBEFOREYESTERDAY"],
+			cy: ["DAYBEFOREYESTERDAY"],
+			en: ["DAYAFTERTOMORROW", "DAYBEFOREYESTERDAY"],
+			fy: ["DAYBEFOREYESTERDAY"],
+			gl: ["DAYBEFOREYESTERDAY"],
+			hu: ["DAYBEFOREYESTERDAY"],
+			id: ["DAYBEFOREYESTERDAY"],
+			it: ["DAYBEFOREYESTERDAY"],
+			"pt-br": ["DAYAFTERTOMORROW"],
+			tr: ["DAYBEFOREYESTERDAY"]
+		};
+
+		// Function to initialize JSDOM and load translations
+		const initializeTranslationDOM = (language) => {
+			const dom = new JSDOM("", { runScripts: "dangerously", resources: "usable" });
+			dom.window.Log = { log: jest.fn() };
+			dom.window.translations = translations;
+			dom.window.eval(translatorJs);
+
+			return new Promise((resolve) => {
 				dom.window.onload = async () => {
 					const { Translator } = dom.window;
-
-					await Translator.load(mmm, translations.de, false);
-					base = Object.keys(Translator.translations[mmm.name]).sort();
-					done();
+					await Translator.load(mmm, translations[language], false);
+					resolve(Translator.translations[mmm.name]);
 				};
 			});
+		};
+
+		beforeAll(async () => {
+			// Using German as the base rather than English, since
+			// some words do not have a direct translation in English.
+			const germanTranslations = await initializeTranslationDOM("de");
+			base = Object.keys(germanTranslations).sort();
 		});

-		afterAll(() => {
-			console.log(missing);
-		});
-
-		// Using German as the base rather than English, since
-		// at least one translated word doesn't exist in English.
-		for (let language in translations) {
-			if (language === "de") {
-				continue;
-			}
+		for (const language in translations) {
+			if (language === "de") continue;

 			describe(`Translation keys of ${language}`, () => {
 				let keys;

-				beforeAll(() => {
-					return new Promise((done) => {
-						const dom = new JSDOM(
-							`<script>var translations = ${JSON.stringify(translations)}; var Log = {log: () => {}};</script>\
-					<script src="file://${path.join(__dirname, "..", "..", "js", "translator.js")}">`,
-							{ runScripts: "dangerously", resources: "usable" }
-						);
-						dom.window.onload = async () => {
-							const { Translator } = dom.window;
-
-							await Translator.load(mmm, translations[language], false);
-							keys = Object.keys(Translator.translations[mmm.name]).sort();
-							done();
-						};
-					});
+				beforeAll(async () => {
+					const languageTranslations = await initializeTranslationDOM(language);
+					keys = Object.keys(languageTranslations).sort();
 				});

-				it(`${language} keys should be in base`, () => {
+				it(`${language} should not contain keys that are not in base language`, () => {
 					keys.forEach((key) => {
-						expect(base.indexOf(key)).toBeGreaterThanOrEqual(0);
+						expect(base).toContain(key, `Translation key '${key}' in language '${language}' is not present in base language`);
 					});
 				});

-				it(`${language} should contain all base keys`, () => {
-					// TODO: when all translations are fixed, use
-					// expect(keys).toEqual(base);
-					// instead of the try-catch-block
+				it(`${language} should contain all base keys (excluding defined exceptions)`, () => {
+					let filteredBase = base.filter((key) => !COMMON_EXCEPTIONS.includes(key));
+					let filteredKeys = keys.filter((key) => !COMMON_EXCEPTIONS.includes(key));

-					try {
-						expect(keys).toEqual(base);
-					} catch (e) {
-						if (e.message.match(/expect.*toEqual/)) {
-							const diff = base.filter((key) => !keys.includes(key));
-							missing.push(`Missing Translations for language ${language}: ${diff}`);
-						} else {
-							throw e;
-						}
+					if (LANGUAGE_EXCEPTIONS[language]) {
+						const exceptions = LANGUAGE_EXCEPTIONS[language];
+						filteredBase = filteredBase.filter((key) => !exceptions.includes(key));
+						filteredKeys = filteredKeys.filter((key) => !exceptions.includes(key));
 					}
+
+					filteredBase.forEach((baseKey) => {
+						expect(filteredKeys).toContain(baseKey, `Translation key '${baseKey}' is missing in language '${language}'`);
+					});
 				});
 			});
 		}
--- a/tests/e2e/vendor_spec.js
+++ b/tests/e2e/vendor_spec.js
@@ -9,22 +9,14 @@ describe("Vendors", () => {
 	});

 	describe("Get list vendors", () => {
-		const vendors = require(`${__dirname}/../../vendor/vendor.js`);
+		const vendors = require(`${__dirname}/../../js/vendor.js`);

 		Object.keys(vendors).forEach((vendor) => {
 			it(`should return 200 HTTP code for vendor "${vendor}"`, async () => {
-				const urlVendor = `http://localhost:8080/vendor/${vendors[vendor]}`;
+				const urlVendor = `http://localhost:8080/${vendors[vendor]}`;
 				const res = await fetch(urlVendor);
 				expect(res.status).toBe(200);
 			});
 		});
-
-		Object.keys(vendors).forEach((vendor) => {
-			it(`should return 404 HTTP code for vendor https://localhost/"${vendor}"`, async () => {
-				const urlVendor = `http://localhost:8080/${vendors[vendor]}`;
-				const res = await fetch(urlVendor);
-				expect(res.status).toBe(404);
-			});
-		});
 	});
 });
--- a/tests/electron/modules/calendar_spec.js
+++ b/tests/electron/modules/calendar_spec.js
@@ -22,6 +22,19 @@ describe("Calendar module", () => {
 		return await loc.count();
 	};

+	/**
+	 * Use this for debugging broken tests, it will console log the text of the calendar module
+	 * @returns {Promise<void>}
+	 */
+	const logAllText = async () => {
+		expect(global.page).not.toBeNull();
+		const loc = await global.page.locator(".calendar .event");
+		const elem = loc.first();
+		await elem.waitFor();
+		expect(elem).not.toBeNull();
+		console.log(await loc.allInnerTexts());
+	};
+
 	const first = 0;
 	const second = 1;
 	const third = 2;
@@ -84,6 +97,10 @@ describe("Calendar module", () => {
 			await helpers.startApplication("tests/configs/modules/calendar/rrule_until.js", "07 Mar 2024 10:38:00 GMT-07:00", [], "America/Los_Angeles");
 			await expect(doTestCount()).resolves.toBe(1);
 		});
+		it("Issue #3781 recurrence rrule until with date only uses timezone offset incorrectly", async () => {
+			await helpers.startApplication("tests/configs/modules/calendar/fullday_until.js", "01 May 2025", [], "America/Los_Angeles");
+			await expect(doTestCount()).resolves.toBe(1);
+		});
 	});

 	/*
@@ -149,19 +166,6 @@ describe("Calendar module", () => {
         * RRULE TESTS:
         * Add any tests that check rrule functionality here.
         */
-	describe("sliceMultiDayEvents", () => {
-		it("Issue #3452 split multiday in Europe", async () => {
-			await helpers.startApplication("tests/configs/modules/calendar/sliceMultiDayEvents.js", "01 Sept 2024 10:38:00 GMT+02:00", [], "Europe/Berlin");
-			expect(global.page).not.toBeNull();
-			const loc = await global.page.locator(".calendar .event");
-			const elem = loc.first();
-			await elem.waitFor();
-			expect(elem).not.toBeNull();
-			const cnt = await loc.count();
-			expect(cnt).toBe(6);
-		});
-	});
-
 	describe("sliceMultiDayEvents direct count", () => {
 		it("Issue #3452 split multiday in Europe", async () => {
 			await helpers.startApplication("tests/configs/modules/calendar/sliceMultiDayEvents.js", "01 Sept 2024 10:38:00 GMT+02:00", [], "Europe/Berlin");
@@ -193,21 +197,30 @@ describe("Calendar module", () => {
 	describe("berlin late in day event moved, viewed from berlin", () => {
 		it("Issue #unknown rrule ETC+2 close to timezone edge", async () => {
 			await helpers.startApplication("tests/configs/modules/calendar/end_of_day_berlin_moved.js", "08 Oct 2024 12:30:00 GMT+02:00", [], "Europe/Berlin");
-			await expect(doTestTableContent(".calendar .event", ".time", "24th.Oct, 23:00-00:00", last)).resolves.toBe(true);
+			await expect(doTestCount()).resolves.toBe(3);
+			await expect(doTestTableContent(".calendar .event", ".time", "22nd.Oct, 23:00-00:00", first)).resolves.toBe(true);
+			await expect(doTestTableContent(".calendar .event", ".time", "23rd.Oct, 23:00-00:00", second)).resolves.toBe(true);
+			await expect(doTestTableContent(".calendar .event", ".time", "24th.Oct, 23:00-00:00", third)).resolves.toBe(true);
 		});
 	});

 	describe("berlin late in day event moved, viewed from sydney", () => {
 		it("Issue #unknown rrule ETC+2 close to timezone edge", async () => {
 			await helpers.startApplication("tests/configs/modules/calendar/end_of_day_berlin_moved.js", "08 Oct 2024 12:30:00 GMT+02:00", [], "Australia/Sydney");
-			await expect(doTestTableContent(".calendar .event", ".time", "25th.Oct, 01:00-02:00", last)).resolves.toBe(true);
+			await expect(doTestCount()).resolves.toBe(3);
+			await expect(doTestTableContent(".calendar .event", ".time", "23rd.Oct, 08:00-09:00", first)).resolves.toBe(true);
+			await expect(doTestTableContent(".calendar .event", ".time", "24th.Oct, 08:00-09:00", second)).resolves.toBe(true);
+			await expect(doTestTableContent(".calendar .event", ".time", "25th.Oct, 08:00-09:00", third)).resolves.toBe(true);
 		});
 	});

 	describe("berlin late in day event moved, viewed from chicago", () => {
 		it("Issue #unknown rrule ETC+2 close to timezone edge", async () => {
 			await helpers.startApplication("tests/configs/modules/calendar/end_of_day_berlin_moved.js", "08 Oct 2024 12:30:00 GMT+02:00", [], "America/Chicago");
-			await expect(doTestTableContent(".calendar .event", ".time", "24th.Oct, 16:00-17:00", last)).resolves.toBe(true);
+			await expect(doTestCount()).resolves.toBe(3);
+			await expect(doTestTableContent(".calendar .event", ".time", "22nd.Oct, 16:00-17:00", first)).resolves.toBe(true);
+			await expect(doTestTableContent(".calendar .event", ".time", "23rd.Oct, 16:00-17:00", second)).resolves.toBe(true);
+			await expect(doTestTableContent(".calendar .event", ".time", "24th.Oct, 16:00-17:00", third)).resolves.toBe(true);
 		});
 	});

--- a/tests/electron/modules/compliments_spec.js
+++ b/tests/electron/modules/compliments_spec.js
@@ -5,6 +5,7 @@ describe("Compliments module", () => {
 	/**
 	 * move similar tests in function doTest
 	 * @param {Array} complimentsArray The array of compliments.
+	 * @param {string} state The state of the element (e.g., "visible" or "attached").
 	 * @returns {boolean} result
 	 */
 	const doTest = async (complimentsArray, state = "visible") => {
@@ -35,7 +36,7 @@ describe("Compliments module", () => {
 			await expect(doTest(["Hello There", "Good Evening", "Evening test"])).resolves.toBe(true);
 		});

-		it("doesnt show evening compliments during the day when the other parts of day are not set", async () => {
+		it("doesn't show evening compliments during the day when the other parts of day are not set", async () => {
 			await helpers.startApplication("tests/configs/modules/compliments/compliments_evening.js", "01 Oct 2022 08:00:00 GMT");
 			await expect(doTest([""], "attached")).resolves.toBe(true);
 		});
--- a/tests/mocks/fullday_until.ics
+++ b/tests/mocks/fullday_until.ics
@@ -0,0 +1,28 @@
+BEGIN:VCALENDAR
+BEGIN:VEVENT
+DESCRIPTION:\n
+RRULE:FREQ=YEARLY;UNTIL=20250504T230000Z;INTERVAL=1;BYMONTHDAY=5;BYMONTH=5
+UID:040000008200E00074C5B7101A82E00800000000DAEF6ED30D9FDA01000000000000000
+ 010000000D37F812F0777844A93E97B96AD2D278B
+SUMMARY:Person A's Birthday
+DTSTART;VALUE=DATE:20250505
+DTEND;VALUE=DATE:20250506
+CLASS:PUBLIC
+PRIORITY:5
+DTSTAMP:20250428T133000Z
+TRANSP:TRANSPARENT
+STATUS:CONFIRMED
+SEQUENCE:0
+LOCATION:
+X-MICROSOFT-CDO-APPT-SEQUENCE:0
+X-MICROSOFT-CDO-BUSYSTATUS:FREE
+X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY
+X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
+X-MICROSOFT-CDO-IMPORTANCE:1
+X-MICROSOFT-CDO-INSTTYPE:1
+X-MICROSOFT-DONOTFORWARDMEETING:FALSE
+X-MICROSOFT-DISALLOW-COUNTER:FALSE
+X-MICROSOFT-REQUESTEDATTENDANCEMODE:DEFAULT
+X-MICROSOFT-ISRESPONSEREQUESTED:FALSE
+END:VEVENT
+END:VCALENDAR
--- a/tests/unit/classes/translator_spec.js
+++ b/tests/unit/classes/translator_spec.js
@@ -1,12 +1,15 @@
+const fs = require("node:fs");
 const path = require("node:path");
 const helmet = require("helmet");
 const { JSDOM } = require("jsdom");
 const express = require("express");

-const sockets = new Set();
-
 describe("Translator", () => {
 	let server;
+	const sockets = new Set();
+	const translatorJsPath = path.join(__dirname, "..", "..", "..", "js", "translator.js");
+	const translatorJsScriptContent = fs.readFileSync(translatorJsPath, "utf8");
+	const translationTestData = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"), "utf8"));

 	beforeAll(() => {
 		const app = express();
@@ -77,86 +80,82 @@ describe("Translator", () => {
 			Translator.coreTranslationsFallback = coreTranslationsFallback;
 		};

-		it("should return custom module translation", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-				dom.window.onload = () => {
-					const { Translator } = dom.window;
-					setTranslations(Translator);
-					let translation = Translator.translate({ name: "MMM-Module" }, "Hello");
-					expect(translation).toBe("Hallo");
-					translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}", { username: "fewieden" });
-					expect(translation).toBe("Hallo fewieden");
-					done();
-				};
-			});
+		it("should return custom module translation", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+
+			await new Promise((resolve) => dom.window.onload = resolve);
+
+			const { Translator } = dom.window;
+			setTranslations(Translator);
+
+			let translation = Translator.translate({ name: "MMM-Module" }, "Hello");
+			expect(translation).toBe("Hallo");
+
+			translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}", { username: "fewieden" });
+			expect(translation).toBe("Hallo fewieden");
 		});

-		it("should return core translation", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-				dom.window.onload = () => {
-					const { Translator } = dom.window;
-					setTranslations(Translator);
-					let translation = Translator.translate({ name: "MMM-Module" }, "FOO");
-					expect(translation).toBe("Foo");
-					translation = Translator.translate({ name: "MMM-Module" }, "BAR {something}", { something: "Lorem Ipsum" });
-					expect(translation).toBe("Bar Lorem Ipsum");
-					done();
-				};
-			});
+		it("should return core translation", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+
+			await new Promise((resolve) => dom.window.onload = resolve);
+
+			const { Translator } = dom.window;
+			setTranslations(Translator);
+			let translation = Translator.translate({ name: "MMM-Module" }, "FOO");
+			expect(translation).toBe("Foo");
+			translation = Translator.translate({ name: "MMM-Module" }, "BAR {something}", { something: "Lorem Ipsum" });
+			expect(translation).toBe("Bar Lorem Ipsum");
 		});

-		it("should return custom module translation fallback", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-				dom.window.onload = () => {
-					const { Translator } = dom.window;
-					setTranslations(Translator);
-					const translation = Translator.translate({ name: "MMM-Module" }, "A key");
-					expect(translation).toBe("A translation");
-					done();
-				};
-			});
+		it("should return custom module translation fallback", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+
+			await new Promise((resolve) => dom.window.onload = resolve);
+
+			const { Translator } = dom.window;
+			setTranslations(Translator);
+			const translation = Translator.translate({ name: "MMM-Module" }, "A key");
+			expect(translation).toBe("A translation");
 		});

-		it("should return core translation fallback", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-				dom.window.onload = () => {
-					const { Translator } = dom.window;
-					setTranslations(Translator);
-					const translation = Translator.translate({ name: "MMM-Module" }, "Fallback");
-					expect(translation).toBe("core fallback");
-					done();
-				};
-			});
+		it("should return core translation fallback", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+
+			await new Promise((resolve) => dom.window.onload = resolve);
+
+			const { Translator } = dom.window;
+			setTranslations(Translator);
+			const translation = Translator.translate({ name: "MMM-Module" }, "Fallback");
+			expect(translation).toBe("core fallback");
 		});

-		it("should return translation with placeholder for missing variables", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-				dom.window.onload = () => {
-					const { Translator } = dom.window;
-					setTranslations(Translator);
-					const translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}");
-					expect(translation).toBe("Hallo {username}");
-					done();
-				};
-			});
+		it("should return translation with placeholder for missing variables", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+
+			await new Promise((resolve) => dom.window.onload = resolve);
+
+			const { Translator } = dom.window;
+			setTranslations(Translator);
+			const translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}");
+			expect(translation).toBe("Hallo {username}");
 		});

-		it("should return key if no translation was found", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-				dom.window.onload = () => {
-					const { Translator } = dom.window;
-					setTranslations(Translator);
-					const translation = Translator.translate({ name: "MMM-Module" }, "MISSING");
-					expect(translation).toBe("MISSING");
-					done();
-				};
-			});
+		it("should return key if no translation was found", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+
+			await new Promise((resolve) => dom.window.onload = resolve);
+
+			const { Translator } = dom.window;
+			setTranslations(Translator);
+			const translation = Translator.translate({ name: "MMM-Module" }, "MISSING");
+			expect(translation).toBe("MISSING");
 		});
 	});

@@ -168,144 +167,127 @@ describe("Translator", () => {
 			}
 		};

-		it("should load translations", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(`<script>var Log = {log: () => {}};</script><script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-				dom.window.onload = async () => {
-					const { Translator } = dom.window;
-					const file = "translation_test.json";
+		it("should load translations", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+			dom.window.Log = { log: jest.fn() };
+			await new Promise((resolve) => dom.window.onload = resolve);

-					await Translator.load(mmm, file, false);
-					const json = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", file));
-					expect(Translator.translations[mmm.name]).toEqual(json);
-					done();
-				};
-			});
+			const { Translator } = dom.window;
+			const file = "translation_test.json";
+
+			await Translator.load(mmm, file, false);
+			const json = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "..", "..", "tests", "mocks", file), "utf8"));
+			expect(Translator.translations[mmm.name]).toEqual(json);
 		});

-		it("should load translation fallbacks", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(`<script>var Log = {log: () => {}};</script><script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-				dom.window.onload = async () => {
-					const { Translator } = dom.window;
-					const file = "translation_test.json";
+		it("should load translation fallbacks", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);

-					await Translator.load(mmm, file, true);
-					const json = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", file));
-					expect(Translator.translationsFallback[mmm.name]).toEqual(json);
-					done();
-				};
-			});
+			await new Promise((resolve) => dom.window.onload = resolve);
+
+			const { Translator } = dom.window;
+			const file = "translation_test.json";
+
+			dom.window.Log = { log: jest.fn() };
+			await Translator.load(mmm, file, true);
+			const json = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "..", "..", "tests", "mocks", file), "utf8"));
+			expect(Translator.translationsFallback[mmm.name]).toEqual(json);
 		});

-		it("should not load translations, if module fallback exists", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(`<script>var Log = {log: () => {}};</script><script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-				dom.window.onload = async () => {
-					const { Translator, XMLHttpRequest } = dom.window;
-					const file = "translation_test.json";
+		it("should not load translations, if module fallback exists", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+			await new Promise((resolve) => dom.window.onload = resolve);

-					XMLHttpRequest.prototype.send = () => {
-						throw new Error("Shouldn't load files");
-					};
+			const { Translator } = dom.window;
+			const file = "translation_test.json";

-					Translator.translationsFallback[mmm.name] = {
-						Hello: "Hallo"
-					};

-					await Translator.load(mmm, file, false);
-					expect(Translator.translations[mmm.name]).toBeUndefined();
-					expect(Translator.translationsFallback[mmm.name]).toEqual({
-						Hello: "Hallo"
-					});
-					done();
-				};
+			dom.window.Log = { log: jest.fn() };
+			Translator.translationsFallback[mmm.name] = {
+				Hello: "Hallo"
+			};
+
+			await Translator.load(mmm, file, false);
+			expect(Translator.translations[mmm.name]).toBeUndefined();
+			expect(Translator.translationsFallback[mmm.name]).toEqual({
+				Hello: "Hallo"
 			});
 		});
 	});

 	describe("loadCoreTranslations", () => {
-		it("should load core translations and fallback", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(
-					`<script>var translations = {en: "http://localhost:3000/translations/translation_test.json"}; var Log = {log: () => {}};</script>\
-					<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`,
-					{ runScripts: "dangerously", resources: "usable" }
-				);
-				dom.window.onload = async () => {
-					const { Translator } = dom.window;
-					await Translator.loadCoreTranslations("en");
+		it("should load core translations and fallback", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+			dom.window.translations = { en: "http://localhost:3000/translations/translation_test.json" };
+			dom.window.Log = { log: jest.fn() };
+			await new Promise((resolve) => dom.window.onload = resolve);

-					const en = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"));
-					setTimeout(() => {
-						expect(Translator.coreTranslations).toEqual(en);
-						expect(Translator.coreTranslationsFallback).toEqual(en);
-						done();
-					}, 500);
-				};
-			});
+			const { Translator } = dom.window;
+			await Translator.loadCoreTranslations("en");
+
+			const en = translationTestData;
+
+			await new Promise((resolve) => setTimeout(resolve, 500));
+
+			expect(Translator.coreTranslations).toEqual(en);
+			expect(Translator.coreTranslationsFallback).toEqual(en);
 		});

-		it("should load core fallback if language cannot be found", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(
-					`<script>var translations = {en: "http://localhost:3000/translations/translation_test.json"}; var Log = {log: () => {}};</script>\
-					<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`,
-					{ runScripts: "dangerously", resources: "usable" }
-				);
-				dom.window.onload = async () => {
-					const { Translator } = dom.window;
-					await Translator.loadCoreTranslations("MISSINGLANG");
+		it("should load core fallback if language cannot be found", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+			dom.window.translations = { en: "http://localhost:3000/translations/translation_test.json" };
+			dom.window.Log = { log: jest.fn() };
+			await new Promise((resolve) => dom.window.onload = resolve);

-					const en = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"));
-					setTimeout(() => {
-						expect(Translator.coreTranslations).toEqual({});
-						expect(Translator.coreTranslationsFallback).toEqual(en);
-						done();
-					}, 500);
-				};
-			});
+			const { Translator } = dom.window;
+			await Translator.loadCoreTranslations("MISSINGLANG");
+
+			const en = translationTestData;
+
+			await new Promise((resolve) => setTimeout(resolve, 500));
+
+			expect(Translator.coreTranslations).toEqual({});
+			expect(Translator.coreTranslationsFallback).toEqual(en);
 		});
 	});

 	describe("loadCoreTranslationsFallback", () => {
-		it("should load core translations fallback", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(
-					`<script>var translations = {en: "http://localhost:3000/translations/translation_test.json"}; var Log = {log: () => {}};</script>\
-					<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`,
-					{ runScripts: "dangerously", resources: "usable" }
-				);
-				dom.window.onload = async () => {
-					const { Translator } = dom.window;
-					await Translator.loadCoreTranslationsFallback();
+		it("should load core translations fallback", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+			dom.window.translations = { en: "http://localhost:3000/translations/translation_test.json" };
+			dom.window.Log = { log: jest.fn() };
+			await new Promise((resolve) => dom.window.onload = resolve);

-					const en = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"));
-					setTimeout(() => {
-						expect(Translator.coreTranslationsFallback).toEqual(en);
-						done();
-					}, 500);
-				};
-			});
+			const { Translator } = dom.window;
+			await Translator.loadCoreTranslationsFallback();
+
+			const en = translationTestData;
+
+			await new Promise((resolve) => setTimeout(resolve, 500));
+
+			expect(Translator.coreTranslationsFallback).toEqual(en);
 		});

-		it("should load core fallback if language cannot be found", () => {
-			return new Promise((done) => {
-				const dom = new JSDOM(
-					`<script>var translations = {}; var Log = {log: () => {}};</script>\
-					<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`,
-					{ runScripts: "dangerously", resources: "usable" }
-				);
-				dom.window.onload = async () => {
-					const { Translator } = dom.window;
-					await Translator.loadCoreTranslations();
+		it("should load core fallback if language cannot be found", async () => {
+			const dom = new JSDOM("", { runScripts: "outside-only" });
+			dom.window.eval(translatorJsScriptContent);
+			dom.window.translations = {};
+			dom.window.Log = { log: jest.fn() };

-					setTimeout(() => {
-						expect(Translator.coreTranslationsFallback).toEqual({});
-						done();
-					}, 500);
-				};
-			});
+			await new Promise((resolve) => dom.window.onload = resolve);
+
+			const { Translator } = dom.window;
+			await Translator.loadCoreTranslations();
+
+			await new Promise((resolve) => setTimeout(resolve, 500));
+
+			expect(Translator.coreTranslationsFallback).toEqual({});
 		});
 	});
 });
--- a/tests/unit/modules/default/calendar/calendar_fetcher_utils_spec.js
+++ b/tests/unit/modules/default/calendar/calendar_fetcher_utils_spec.js
@@ -1,5 +1,8 @@
 global.moment = require("moment-timezone");

+const ical = require("node-ical");
+const { expect } = require("playwright/test");
+const moment = require("moment-timezone");
 const CalendarFetcherUtils = require("../../../../../modules/default/calendar/calendarfetcherutils");

 describe("Calendar fetcher utils test", () => {
@@ -49,5 +52,65 @@ describe("Calendar fetcher utils test", () => {
 			expect(filteredEvents[0].title).toBe("ongoingEvent");
 			expect(filteredEvents[1].title).toBe("upcomingEvent");
 		});
+
+		it("should return the correct times when recurring events pass through daylight saving time", () => {
+			const data = ical.parseICS(`BEGIN:VEVENT
+DTSTART;TZID=Europe/Amsterdam:20250311T090000
+DTEND;TZID=Europe/Amsterdam:20250311T091500
+RRULE:FREQ=WEEKLY;BYDAY=FR,MO,TH,TU,WE,SA,SU
+DTSTAMP:20250531T091103Z
+ORGANIZER;CN=test:mailto:test@test.com
+UID:67e65a1d-b889-4451-8cab-5518cecb9c66
+CREATED:20230111T114612Z
+DESCRIPTION:Test
+LAST-MODIFIED:20250528T071312Z
+SEQUENCE:1
+STATUS:CONFIRMED
+SUMMARY:Test
+TRANSP:OPAQUE
+END:VEVENT`);
+
+			const filteredEvents = CalendarFetcherUtils.filterEvents(data, defaultConfig);
+
+			const januaryFirst = filteredEvents.filter((event) => moment(event.startDate, "x").format("MM-DD") === "01-01");
+			const julyFirst = filteredEvents.filter((event) => moment(event.startDate, "x").format("MM-DD") === "07-01");
+
+			let januaryMoment = moment(`${moment(januaryFirst[0].startDate, "x").format("YYYY")}-01-01T09:00:00`)
+				.tz("Europe/Amsterdam", true) // Convert to Europe/Amsterdam timezone (see event ical) but keep 9 o'clock
+				.tz(moment.tz.guess()); // Convert to guessed timezone as that is used in the filterEvents
+
+			let julyMoment = moment(`${moment(julyFirst[0].startDate, "x").format("YYYY")}-07-01T09:00:00`)
+				.tz("Europe/Amsterdam", true) // Convert to Europe/Amsterdam timezone (see event ical) but keep 9 o'clock
+				.tz(moment.tz.guess()); // Convert to guessed timezone as that is used in the filterEvents
+
+			expect(januaryFirst[0].startDate).toEqual(januaryMoment.format("x"));
+			expect(julyFirst[0].startDate).toEqual(julyMoment.format("x"));
+		});
+
+		it("should return the correct moments based on the timezone given", () => {
+			const data = ical.parseICS(`BEGIN:VEVENT
+DTSTART;TZID=Europe/Amsterdam:20250311T090000
+DTEND;TZID=Europe/Amsterdam:20250311T091500
+RRULE:FREQ=WEEKLY;BYDAY=FR,MO,TH,TU,WE,SA,SU
+DTSTAMP:20250531T091103Z
+ORGANIZER;CN=test:mailto:test@test.com
+UID:67e65a1d-b889-4451-8cab-5518cecb9c66
+CREATED:20230111T114612Z
+DESCRIPTION:Test
+LAST-MODIFIED:20250528T071312Z
+SEQUENCE:1
+STATUS:CONFIRMED
+SUMMARY:Test
+TRANSP:OPAQUE
+END:VEVENT`);
+
+			const moments = CalendarFetcherUtils.getMomentsFromRecurringEvent(data["67e65a1d-b889-4451-8cab-5518cecb9c66"], moment(), moment().add(365, "days"));
+
+			const januaryFirst = moments.filter((m) => m.format("MM-DD") === "01-01");
+			const julyFirst = moments.filter((m) => m.format("MM-DD") === "07-01");
+
+			expect(januaryFirst[0].toISOString(true)).toContain("09:00:00.000+01:00");
+			expect(julyFirst[0].toISOString(true)).toContain("09:00:00.000+02:00");
+		});
 	});
 });