Release 2.24.0 (#3141)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Karsten Hassel <hassel@gmx.de>
Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com>
Co-authored-by: Veeck <github@veeck.de>
Co-authored-by: veeck <michael@veeck.de>
Co-authored-by: dWoolridge <dwoolridge@charter.net>
Co-authored-by: Johan <jojjepersson@yahoo.se>
Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com>
Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com>
Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com>
Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com>
Co-authored-by: buxxi <buxxi@omfilm.net>
Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com>
Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com>
Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
Co-authored-by: Dave Child <dave@addedbytes.com>
Co-authored-by: grenagit <46225780+grenagit@users.noreply.github.com>
Co-authored-by: Grena <grena@grenabox.fr>
Co-authored-by: Magnus Marthinsen <magmar@online.no>
Co-authored-by: Patrick <psieg@users.noreply.github.com>
Co-authored-by: Piotr Rajnisz <56397164+rajniszp@users.noreply.github.com>
Co-authored-by: Suthep Yonphimai <tomzt@users.noreply.github.com>
Co-authored-by: CarJem Generations (Carter Wallace) <cwallacecs@gmail.com>
Co-authored-by: Nicholas Fogal <nfogal.misc@gmail.com>
Co-authored-by: JakeBinney <126349119+JakeBinney@users.noreply.github.com>
Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com>
Co-authored-by: Oscar Björkman <17575446+oscarb@users.noreply.github.com>
Co-authored-by: Ismar Slomic <ismar@slomic.no>
Co-authored-by: Jørgen Veum-Wahlberg <jorgen.wahlberg@amedia.no>
Co-authored-by: Eddie Hung <6740044+eddiehung@users.noreply.github.com>
Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr>
Co-authored-by: bugsounet <bugsounet@bugsounet.fr>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

tests/e2e/helpers/mock-console.js

@@ -1,10 +1,17 @@
 /**
  * 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("write EPIPE")) {
+	if (
+		err.includes("ECONNREFUSED") ||
+		err.includes("ECONNRESET") ||
+		err.includes("socket hang up") ||
+		err.includes("exports is not defined") ||
+		err.includes("write EPIPE") ||
+		err.includes("AggregateError") ||
+		err.includes("ERR_SOCKET_CONNECTION_TIMEOUT")
+	) {
 		jest.fn();
 	} else {
 		console.dir(err);

tests/e2e/modules/clock_spec.js

@@ -107,4 +107,18 @@ describe("Clock module", () => {
 			expect(elem).not.toBe(null);
 		});
 	});
+
+	describe("with analog clock face and date enabled", () => {
+		beforeAll(async () => {
+			await helpers.startApplication("tests/configs/modules/clock/clock_showDateAnalog.js");
+			await helpers.getDocument();
+		});
+
+		it("should show the analog clock face and the date", async () => {
+			const elemClock = helpers.waitForElement(".clock-circle");
+			await expect(elemClock).not.toBe(null);
+			const elemDate = helpers.waitForElement(".clock .date");
+			await expect(elemDate).not.toBe(null);
+		});
+	});
 });

tests/e2e/modules/compliments_spec.js

@@ -3,7 +3,6 @@ const helpers = require("../helpers/global-setup");
 describe("Compliments module", () => {
 	/**
 	 * move similar tests in function doTest
-	 *
 	 * @param {Array} complimentsArray The array of compliments.
 	 */
 	const doTest = async (complimentsArray) => {
@@ -25,7 +24,7 @@ describe("Compliments module", () => {
 				await helpers.getDocument();
 			});
 
-			it("Show anytime because if configure empty parts of day compliments and set anytime compliments", async () => {
+			it("shows anytime because if configure empty parts of day compliments and set anytime compliments", async () => {
 				await doTest(["Anytime here"]);
 			});
 		});
@@ -36,7 +35,7 @@ describe("Compliments module", () => {
 				await helpers.getDocument();
 			});
 
-			it("Show anytime compliments", async () => {
+			it("shows anytime compliments", async () => {
 				await doTest(["Anytime here"]);
 			});
 		});

tests/e2e/modules_empty_spec.js

@@ -9,13 +9,13 @@ describe("Check configuration without modules", () => {
 		await helpers.stopApplication();
 	});
 
-	it("Show the message MagicMirror² title", async () => {
+	it("shows the message MagicMirror² title", async () => {
 		const elem = await helpers.waitForElement("#module_1_helloworld .module-content");
 		expect(elem).not.toBe(null);
 		expect(elem.textContent).toContain("MagicMirror²");
 	});
 
-	it("Show the url of michael's website", async () => {
+	it("shows the url of michael's website", async () => {
 		const elem = await helpers.waitForElement("#module_5_helloworld .module-content");
 		expect(elem).not.toBe(null);
 		expect(elem.textContent).toContain("www.michaelteeuw.nl");

tests/e2e/serveronly_spec.js

@@ -0,0 +1,28 @@
+const helpers = require("./helpers/global-setup");
+
+const delay = (time) => {
+	return new Promise((resolve) => setTimeout(resolve, time));
+};
+
+describe("App environment", () => {
+	let serverProcess;
+	beforeAll(async () => {
+		process.env.MM_CONFIG_FILE = "tests/configs/default.js";
+		serverProcess = await require("child_process").spawn("npm", ["run", "server"], { env: process.env, detached: true });
+		// we have to wait until the server is startet
+		await delay(2000);
+	});
+	afterAll(async () => {
+		await process.kill(-serverProcess.pid);
+	});
+
+	it("get request from http://localhost:8080 should return 200", async () => {
+		const res = await helpers.fetch("http://localhost:8080");
+		expect(res.status).toBe(200);
+	});
+
+	it("get request from http://localhost:8080/nothing should return 404", async () => {
+		const res = await helpers.fetch("http://localhost:8080/nothing");
+		expect(res.status).toBe(404);
+	});
+});