Release 2.22.0 (#2983)

## [2.22.0] - 2023-01-01 Thanks to: @angeldeejay, @buxxi, @dariom, @dWoolridge, @KristjanESPERANTO, @MagMar94, @naveensrinivasan, @retroflex, @SkySails and @Tom. Special thanks to @khassel, @rejas and @sdetweil for taking over most (if not all) of the work on this release as project collaborators. This version would not be there without their effort. Thank you! ### Added - Added test for remoteFile option in compliments module - Added hourlyWeather functionality to Weather.gov weather provider - Removed weatherEndpoint definition from weathergov.js (not used) - Added css class names "today" and "tomorrow" for default calendar - Added Collaboration.md - Added new github action for dependency review (#2862) - Added a WeatherProvider for Open-Meteo - Added Yr as a weather provider - Added config options "ignoreXOriginHeader" and "ignoreContentSecurityPolicy" ### Removed - Removed usage of internal fetch function of node until it is more stable ### Updated - Cleaned up test directory (#2937) and jest config (#2959) - Wait for all modules to start before declaring the system ready (#2487) - Updated e2e tests (moved `done()` in helper functions) and use es6 syntax in all tests - Updated da translation - Rework weather module - Make sure smhi provider api only gets a maximum of 6 digits coordinates (#2955) - Use fetch instead of XMLHttpRequest in weatherprovider (#2935) - Reworked how weatherproviders handle units (#2849) - Use unix() method for parsing times, fix suntimes on the way (#2950) - Refactor conversion functions into utils class (#2958) - The `cors`-method in `server.js` now supports sending and recieving HTTP headers - Replace `…` by `…` - Cleanup compliments module - Updated dependencies including electron to v22 (#2903) ### Fixed - Correctly show apparent temperature in SMHI weather provider - Ensure updatenotification module isn't shown when local is _ahead_ of remote - Handle node_helper errors during startup (#2944) - Possibility to change FontAwesome class in calendar, so icons like `fab fa-facebook-square` works. - Fix cors problems with newsfeed articles (as far as possible), allow disabling cors per feed with option `useCorsProxy: false` (#2840) - Tests not waiting for the application to start and stop before starting the next test - Fix electron tests failing sometimes in github workflow - Fixed gap in clock module when displayed on the left side with displayType=digital - Fixed playwright issue by upgrading to v1.29.1 (#2969) Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.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>
2025-09-13 23:55:11 +00:00 · 2023-01-01 18:09:08 +01:00
parent 9e0293047f
commit 0300ce05d5
151 changed files with 5890 additions and 4949 deletions
--- a/tests/unit/classes/class_spec.js
+++ b/tests/unit/classes/class_spec.js
@@ -1,39 +1,39 @@
 const path = require("path");
 const { JSDOM } = require("jsdom");

-describe("File js/class", function () {
-	describe("Test function cloneObject", function () {
+describe("File js/class", () => {
+	describe("Test function cloneObject", () => {
 		let clone;
 		let dom;

-		beforeAll(function (done) {
+		beforeAll((done) => {
 			dom = new JSDOM(
-				`<script>var Log = {log: function() {}};</script>\
+				`<script>var Log = {log: () => {}};</script>\
 					<script src="file://${path.join(__dirname, "..", "..", "..", "js", "class.js")}">`,
 				{ runScripts: "dangerously", resources: "usable" }
 			);
-			dom.window.onload = function () {
+			dom.window.onload = () => {
 				const { cloneObject } = dom.window;
 				clone = cloneObject;
 				done();
 			};
 		});

-		it("should clone object", function () {
+		it("should clone object", () => {
 			const expected = { name: "Rodrigo", web: "https://rodrigoramirez.com", project: "MagicMirror" };
 			const obj = clone(expected);
 			expect(obj).toEqual(expected);
 			expect(expected === obj).toBe(false);
 		});

-		it("should clone array", function () {
+		it("should clone array", () => {
 			const expected = [1, null, undefined, "TEST"];
 			const obj = clone(expected);
 			expect(obj).toEqual(expected);
 			expect(expected === obj).toBe(false);
 		});

-		it("should clone number", function () {
+		it("should clone number", () => {
 			let expected = 1;
 			let obj = clone(expected);
 			expect(obj).toBe(expected);
@@ -43,25 +43,25 @@ describe("File js/class", function () {
 			expect(obj).toBe(expected);
 		});

-		it("should clone string", function () {
+		it("should clone string", () => {
 			const expected = "Perfect stranger";
 			const obj = clone(expected);
 			expect(obj).toBe(expected);
 		});

-		it("should clone undefined", function () {
+		it("should clone undefined", () => {
 			const expected = undefined;
 			const obj = clone(expected);
 			expect(obj).toBe(expected);
 		});

-		it("should clone null", function () {
+		it("should clone null", () => {
 			const expected = null;
 			const obj = clone(expected);
 			expect(obj).toBe(expected);
 		});

-		it("should clone nested object", function () {
+		it("should clone nested object", () => {
 			const expected = {
 				name: "fewieden",
 				link: "https://github.com/fewieden",
@@ -83,21 +83,21 @@ describe("File js/class", function () {
 			expect(expected.properties.items[1] === obj.properties.items[1]).toBe(false);
 		});

-		describe("Test lockstring code", function () {
+		describe("Test lockstring code", () => {
 			let log;

-			beforeAll(function () {
+			beforeAll(() => {
 				log = dom.window.Log.log;
-				dom.window.Log.log = function cmp(str) {
+				dom.window.Log.log = (str) => {
 					expect(str).toBe("lockStrings");
 				};
 			});

-			afterAll(function () {
+			afterAll(() => {
 				dom.window.Log.log = log;
 			});

-			it("should clone object and log lockStrings", function () {
+			it("should clone object and log lockStrings", () => {
 				const expected = { name: "Module", lockStrings: "stringLock" };
 				const obj = clone(expected);
 				expect(obj).toEqual(expected);
--- a/tests/unit/classes/deprecated_spec.js
+++ b/tests/unit/classes/deprecated_spec.js
@@ -1,11 +1,11 @@
 const deprecated = require("../../../js/deprecated");

-describe("Deprecated", function () {
-	it("should be an object", function () {
+describe("Deprecated", () => {
+	it("should be an object", () => {
 		expect(typeof deprecated).toBe("object");
 	});

-	it("should contain configs array with deprecated options as strings", function () {
+	it("should contain configs array with deprecated options as strings", () => {
 		expect(Array.isArray(["deprecated.configs"])).toBe(true);
 		for (let option of deprecated.configs) {
 			expect(typeof option).toBe("string");
--- a/tests/unit/classes/translator_spec.js
+++ b/tests/unit/classes/translator_spec.js
@@ -4,17 +4,17 @@ const { JSDOM } = require("jsdom");
 const express = require("express");
 const sockets = new Set();

-describe("Translator", function () {
+describe("Translator", () => {
 	let server;

-	beforeAll(function () {
+	beforeAll(() => {
 		const app = express();
 		app.use(helmet());
-		app.use(function (req, res, next) {
+		app.use((req, res, next) => {
 			res.header("Access-Control-Allow-Origin", "*");
 			next();
 		});
-		app.use("/translations", express.static(path.join(__dirname, "..", "..", "..", "tests", "configs", "data")));
+		app.use("/translations", express.static(path.join(__dirname, "..", "..", "..", "tests", "mocks")));

 		server = app.listen(3000);

@@ -23,7 +23,7 @@ describe("Translator", function () {
 		});
 	});

-	afterAll(function () {
+	afterAll(() => {
 		for (const socket of sockets) {
 			socket.destroy();

@@ -33,7 +33,7 @@ describe("Translator", function () {
 		server.close();
 	});

-	describe("translate", function () {
+	describe("translate", () => {
 		const translations = {
 			"MMM-Module": {
 				Hello: "Hallo",
@@ -70,16 +70,16 @@ describe("Translator", function () {
 		/**
 		 * @param {object} Translator the global Translator object
 		 */
-		function setTranslations(Translator) {
+		const setTranslations = (Translator) => {
 			Translator.translations = translations;
 			Translator.coreTranslations = coreTranslations;
 			Translator.translationsFallback = translationsFallback;
 			Translator.coreTranslationsFallback = coreTranslationsFallback;
-		}
+		};

-		it("should return custom module translation", function (done) {
+		it("should return custom module translation", (done) => {
 			const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-			dom.window.onload = function () {
+			dom.window.onload = () => {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				let translation = Translator.translate({ name: "MMM-Module" }, "Hello");
@@ -90,9 +90,9 @@ describe("Translator", function () {
 			};
 		});

-		it("should return core translation", function (done) {
+		it("should return core translation", (done) => {
 			const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-			dom.window.onload = function () {
+			dom.window.onload = () => {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				let translation = Translator.translate({ name: "MMM-Module" }, "FOO");
@@ -103,9 +103,9 @@ describe("Translator", function () {
 			};
 		});

-		it("should return custom module translation fallback", function (done) {
+		it("should return custom module translation fallback", (done) => {
 			const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-			dom.window.onload = function () {
+			dom.window.onload = () => {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				const translation = Translator.translate({ name: "MMM-Module" }, "A key");
@@ -114,9 +114,9 @@ describe("Translator", function () {
 			};
 		});

-		it("should return core translation fallback", function (done) {
+		it("should return core translation fallback", (done) => {
 			const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-			dom.window.onload = function () {
+			dom.window.onload = () => {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				const translation = Translator.translate({ name: "MMM-Module" }, "Fallback");
@@ -125,9 +125,9 @@ describe("Translator", function () {
 			};
 		});

-		it("should return translation with placeholder for missing variables", function (done) {
+		it("should return translation with placeholder for missing variables", (done) => {
 			const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-			dom.window.onload = function () {
+			dom.window.onload = () => {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				const translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}");
@@ -136,9 +136,9 @@ describe("Translator", function () {
 			};
 		});

-		it("should return key if no translation was found", function (done) {
+		it("should return key if no translation was found", (done) => {
 			const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-			dom.window.onload = function () {
+			dom.window.onload = () => {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				const translation = Translator.translate({ name: "MMM-Module" }, "MISSING");
@@ -148,7 +148,7 @@ describe("Translator", function () {
 		});
 	});

-	describe("load", function () {
+	describe("load", () => {
 		const mmm = {
 			name: "TranslationTest",
 			file(file) {
@@ -156,41 +156,41 @@ describe("Translator", function () {
 			}
 		};

-		it("should load translations", function (done) {
-			const dom = new JSDOM(`<script>var Log = {log: function(){}};</script><script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-			dom.window.onload = function () {
+		it("should load translations", (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 = () => {
 				const { Translator } = dom.window;
-				const file = "TranslationTest.json";
+				const file = "translation_test.json";

-				Translator.load(mmm, file, false, function () {
-					const json = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", file));
+				Translator.load(mmm, file, false, () => {
+					const json = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", file));
 					expect(Translator.translations[mmm.name]).toEqual(json);
 					done();
 				});
 			};
 		});

-		it("should load translation fallbacks", function (done) {
-			const dom = new JSDOM(`<script>var Log = {log: function(){}};</script><script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-			dom.window.onload = function () {
+		it("should load translation fallbacks", (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 = () => {
 				const { Translator } = dom.window;
-				const file = "TranslationTest.json";
+				const file = "translation_test.json";

-				Translator.load(mmm, file, true, function () {
-					const json = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", file));
+				Translator.load(mmm, file, true, () => {
+					const json = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", file));
 					expect(Translator.translationsFallback[mmm.name]).toEqual(json);
 					done();
 				});
 			};
 		});

-		it("should not load translations, if module fallback exists", function (done) {
-			const dom = new JSDOM(`<script>var Log = {log: function(){}};</script><script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
-			dom.window.onload = function () {
+		it("should not load translations, if module fallback exists", (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 = () => {
 				const { Translator, XMLHttpRequest } = dom.window;
-				const file = "TranslationTest.json";
+				const file = "translation_test.json";

-				XMLHttpRequest.prototype.send = function () {
+				XMLHttpRequest.prototype.send = () => {
 					throw "Shouldn't load files";
 				};

@@ -198,7 +198,7 @@ describe("Translator", function () {
 					Hello: "Hallo"
 				};

-				Translator.load(mmm, file, false, function () {
+				Translator.load(mmm, file, false, () => {
 					expect(Translator.translations[mmm.name]).toBe(undefined);
 					expect(Translator.translationsFallback[mmm.name]).toEqual({
 						Hello: "Hallo"
@@ -209,19 +209,19 @@ describe("Translator", function () {
 		});
 	});

-	describe("loadCoreTranslations", function () {
-		it("should load core translations and fallback", function (done) {
+	describe("loadCoreTranslations", () => {
+		it("should load core translations and fallback", (done) => {
 			const dom = new JSDOM(
-				`<script>var translations = {en: "http://localhost:3000/translations/en.json"}; var Log = {log: function(){}};</script>\
+				`<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 = function () {
+			dom.window.onload = () => {
 				const { Translator } = dom.window;
 				Translator.loadCoreTranslations("en");

-				const en = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", "en.json"));
-				setTimeout(function () {
+				const en = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"));
+				setTimeout(() => {
 					expect(Translator.coreTranslations).toEqual(en);
 					expect(Translator.coreTranslationsFallback).toEqual(en);
 					done();
@@ -229,18 +229,18 @@ describe("Translator", function () {
 			};
 		});

-		it("should load core fallback if language cannot be found", function (done) {
+		it("should load core fallback if language cannot be found", (done) => {
 			const dom = new JSDOM(
-				`<script>var translations = {en: "http://localhost:3000/translations/en.json"}; var Log = {log: function(){}};</script>\
+				`<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 = function () {
+			dom.window.onload = () => {
 				const { Translator } = dom.window;
 				Translator.loadCoreTranslations("MISSINGLANG");

-				const en = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", "en.json"));
-				setTimeout(function () {
+				const en = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"));
+				setTimeout(() => {
 					expect(Translator.coreTranslations).toEqual({});
 					expect(Translator.coreTranslationsFallback).toEqual(en);
 					done();
@@ -249,36 +249,36 @@ describe("Translator", function () {
 		});
 	});

-	describe("loadCoreTranslationsFallback", function () {
-		it("should load core translations fallback", function (done) {
+	describe("loadCoreTranslationsFallback", () => {
+		it("should load core translations fallback", (done) => {
 			const dom = new JSDOM(
-				`<script>var translations = {en: "http://localhost:3000/translations/en.json"}; var Log = {log: function(){}};</script>\
+				`<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 = function () {
+			dom.window.onload = () => {
 				const { Translator } = dom.window;
 				Translator.loadCoreTranslationsFallback();

-				const en = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", "en.json"));
-				setTimeout(function () {
+				const en = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"));
+				setTimeout(() => {
 					expect(Translator.coreTranslationsFallback).toEqual(en);
 					done();
 				}, 500);
 			};
 		});

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

-				setTimeout(function () {
+				setTimeout(() => {
 					expect(Translator.coreTranslationsFallback).toEqual({});
 					done();
 				}, 500);
--- a/tests/unit/classes/utils_spec.js
+++ b/tests/unit/classes/utils_spec.js
@@ -1,34 +1,34 @@
 const Utils = require("../../../js/utils.js");
 const colors = require("colors/safe");

-describe("Utils", function () {
-	describe("colors", function () {
+describe("Utils", () => {
+	describe("colors", () => {
 		const colorsEnabled = colors.enabled;

-		afterEach(function () {
+		afterEach(() => {
 			colors.enabled = colorsEnabled;
 		});

-		it("should have info, warn and error properties", function () {
+		it("should have info, warn and error properties", () => {
 			expect(Utils.colors).toHaveProperty("info");
 			expect(Utils.colors).toHaveProperty("warn");
 			expect(Utils.colors).toHaveProperty("error");
 		});

-		it("properties should be functions", function () {
+		it("properties should be functions", () => {
 			expect(typeof Utils.colors.info).toBe("function");
 			expect(typeof Utils.colors.warn).toBe("function");
 			expect(typeof Utils.colors.error).toBe("function");
 		});

-		it("should print colored message in supported consoles", function () {
+		it("should print colored message in supported consoles", () => {
 			colors.enabled = true;
 			expect(Utils.colors.info("some informations")).toBe("\u001b[34msome informations\u001b[39m");
 			expect(Utils.colors.warn("a warning")).toBe("\u001b[33ma warning\u001b[39m");
 			expect(Utils.colors.error("ERROR!")).toBe("\u001b[31mERROR!\u001b[39m");
 		});

-		it("should print message in unsupported consoles", function () {
+		it("should print message in unsupported consoles", () => {
 			colors.enabled = false;
 			expect(Utils.colors.info("some informations")).toBe("some informations");
 			expect(Utils.colors.warn("a warning")).toBe("a warning");
--- a/tests/unit/functions/calendar_spec.js
+++ b/tests/unit/functions/calendar_spec.js
@@ -1,19 +1,19 @@
 global.moment = require("moment");

-describe("Functions into modules/default/calendar/calendar.js", function () {
+describe("Functions into modules/default/calendar/calendar.js", () => {
 	// Fake for use by calendar.js
 	Module = {};
 	Module.definitions = {};
-	Module.register = function (name, moduleDefinition) {
+	Module.register = (name, moduleDefinition) => {
 		Module.definitions[name] = moduleDefinition;
 	};

-	beforeAll(function () {
+	beforeAll(() => {
 		// load calendar.js
 		require("../../../modules/default/calendar/calendar.js");
 	});

-	describe("capFirst", function () {
+	describe("capFirst", () => {
 		const words = {
 			rodrigo: "Rodrigo",
 			"123m": "123m",
@@ -23,61 +23,61 @@ describe("Functions into modules/default/calendar/calendar.js", function () {
 		};

 		Object.keys(words).forEach((word) => {
-			it(`for '${word}' should return '${words[word]}'`, function () {
+			it(`for '${word}' should return '${words[word]}'`, () => {
 				expect(Module.definitions.calendar.capFirst(word)).toBe(words[word]);
 			});
 		});
 	});

-	describe("getLocaleSpecification", function () {
-		it("should return a valid moment.LocaleSpecification for a 12-hour format", function () {
+	describe("getLocaleSpecification", () => {
+		it("should return a valid moment.LocaleSpecification for a 12-hour format", () => {
 			expect(Module.definitions.calendar.getLocaleSpecification(12)).toEqual({ longDateFormat: { LT: "h:mm A" } });
 		});

-		it("should return a valid moment.LocaleSpecification for a 24-hour format", function () {
+		it("should return a valid moment.LocaleSpecification for a 24-hour format", () => {
 			expect(Module.definitions.calendar.getLocaleSpecification(24)).toEqual({ longDateFormat: { LT: "HH:mm" } });
 		});

-		it("should return the current system locale when called without timeFormat number", function () {
+		it("should return the current system locale when called without timeFormat number", () => {
 			expect(Module.definitions.calendar.getLocaleSpecification()).toEqual({ longDateFormat: { LT: moment.localeData().longDateFormat("LT") } });
 		});

-		it("should return a 12-hour longDateFormat when using the 'en' locale", function () {
+		it("should return a 12-hour longDateFormat when using the 'en' locale", () => {
 			const localeBackup = moment.locale();
 			moment.locale("en");
 			expect(Module.definitions.calendar.getLocaleSpecification()).toEqual({ longDateFormat: { LT: "h:mm A" } });
 			moment.locale(localeBackup);
 		});

-		it("should return a 12-hour longDateFormat when using the 'au' locale", function () {
+		it("should return a 12-hour longDateFormat when using the 'au' locale", () => {
 			const localeBackup = moment.locale();
 			moment.locale("au");
 			expect(Module.definitions.calendar.getLocaleSpecification()).toEqual({ longDateFormat: { LT: "h:mm A" } });
 			moment.locale(localeBackup);
 		});

-		it("should return a 12-hour longDateFormat when using the 'eg' locale", function () {
+		it("should return a 12-hour longDateFormat when using the 'eg' locale", () => {
 			const localeBackup = moment.locale();
 			moment.locale("eg");
 			expect(Module.definitions.calendar.getLocaleSpecification()).toEqual({ longDateFormat: { LT: "h:mm A" } });
 			moment.locale(localeBackup);
 		});

-		it("should return a 24-hour longDateFormat when using the 'nl' locale", function () {
+		it("should return a 24-hour longDateFormat when using the 'nl' locale", () => {
 			const localeBackup = moment.locale();
 			moment.locale("nl");
 			expect(Module.definitions.calendar.getLocaleSpecification()).toEqual({ longDateFormat: { LT: "HH:mm" } });
 			moment.locale(localeBackup);
 		});

-		it("should return a 24-hour longDateFormat when using the 'fr' locale", function () {
+		it("should return a 24-hour longDateFormat when using the 'fr' locale", () => {
 			const localeBackup = moment.locale();
 			moment.locale("fr");
 			expect(Module.definitions.calendar.getLocaleSpecification()).toEqual({ longDateFormat: { LT: "HH:mm" } });
 			moment.locale(localeBackup);
 		});

-		it("should return a 24-hour longDateFormat when using the 'uk' locale", function () {
+		it("should return a 24-hour longDateFormat when using the 'uk' locale", () => {
 			const localeBackup = moment.locale();
 			moment.locale("uk");
 			expect(Module.definitions.calendar.getLocaleSpecification()).toEqual({ longDateFormat: { LT: "HH:mm" } });
@@ -85,43 +85,43 @@ describe("Functions into modules/default/calendar/calendar.js", function () {
 		});
 	});

-	describe("shorten", function () {
+	describe("shorten", () => {
 		const strings = {
-			" String with whitespace at the beginning that needs trimming": { length: 16, return: "String with whit&hellip;" },
-			"long string that needs shortening": { length: 16, return: "long string that&hellip;" },
+			" String with whitespace at the beginning that needs trimming": { length: 16, return: "String with whit…" },
+			"long string that needs shortening": { length: 16, return: "long string that…" },
 			"short string": { length: 16, return: "short string" },
 			"long string with no maxLength defined": { return: "long string with no maxLength defined" }
 		};

 		Object.keys(strings).forEach((string) => {
-			it(`for '${string}' should return '${strings[string].return}'`, function () {
+			it(`for '${string}' should return '${strings[string].return}'`, () => {
 				expect(Module.definitions.calendar.shorten(string, strings[string].length)).toBe(strings[string].return);
 			});
 		});

-		it("should return an empty string if shorten is called with a non-string", function () {
+		it("should return an empty string if shorten is called with a non-string", () => {
 			expect(Module.definitions.calendar.shorten(100)).toBe("");
 		});

-		it("should not shorten the string if shorten is called with a non-number maxLength", function () {
+		it("should not shorten the string if shorten is called with a non-number maxLength", () => {
 			expect(Module.definitions.calendar.shorten("This is a test string", "This is not a number")).toBe("This is a test string");
 		});

-		it("should wrap the string instead of shorten it if shorten is called with wrapEvents = true (with maxLength defined as 20)", function () {
+		it("should wrap the string instead of shorten it if shorten is called with wrapEvents = true (with maxLength defined as 20)", () => {
 			expect(Module.definitions.calendar.shorten("This is a wrapEvent test. Should wrap the string instead of shorten it if called with wrapEvent = true", 20, true)).toBe(
 				"This is a <br>wrapEvent test. Should wrap <br>the string instead of <br>shorten it if called with <br>wrapEvent = true"
 			);
 		});

-		it("should wrap the string instead of shorten it if shorten is called with wrapEvents = true (without maxLength defined, default 25)", function () {
+		it("should wrap the string instead of shorten it if shorten is called with wrapEvents = true (without maxLength defined, default 25)", () => {
 			expect(Module.definitions.calendar.shorten("This is a wrapEvent test. Should wrap the string instead of shorten it if called with wrapEvent = true", undefined, true)).toBe(
 				"This is a wrapEvent <br>test. Should wrap the string <br>instead of shorten it if called <br>with wrapEvent = true"
 			);
 		});

-		it("should wrap and shorten the string in the second line if called with wrapEvents = true and maxTitleLines = 2", function () {
+		it("should wrap and shorten the string in the second line if called with wrapEvents = true and maxTitleLines = 2", () => {
 			expect(Module.definitions.calendar.shorten("This is a wrapEvent and maxTitleLines test. Should wrap and shorten the string in the second line if called with wrapEvents = true and maxTitleLines = 2", undefined, true, 2)).toBe(
-				"This is a wrapEvent and <br>maxTitleLines test. Should wrap and &hellip;"
+				"This is a wrapEvent and <br>maxTitleLines test. Should wrap and …"
 			);
 		});
 	});
--- a/tests/unit/functions/cmp_versions_spec.js
+++ b/tests/unit/functions/cmp_versions_spec.js
@@ -1,31 +1,31 @@
 const path = require("path");
 const { JSDOM } = require("jsdom");

-describe("Test function cmpVersions in js/module.js", function () {
+describe("Test function cmpVersions in js/module.js", () => {
 	let cmp;

-	beforeAll(function (done) {
+	beforeAll((done) => {
 		const dom = new JSDOM(
-			`<script>var Class = {extend: function() { return {}; }};</script>\
+			`<script>var Class = {extend: () => { return {}; }};</script>\
 				<script src="file://${path.join(__dirname, "..", "..", "..", "js", "module.js")}">`,
 			{ runScripts: "dangerously", resources: "usable" }
 		);
-		dom.window.onload = function () {
+		dom.window.onload = () => {
 			const { cmpVersions } = dom.window;
 			cmp = cmpVersions;
 			done();
 		};
 	});

-	it("should return -1 when comparing 2.1 to 2.2", function () {
+	it("should return -1 when comparing 2.1 to 2.2", () => {
 		expect(cmp("2.1", "2.2")).toBe(-1);
 	});

-	it("should be return 0 when comparing 2.2 to 2.2", function () {
+	it("should be return 0 when comparing 2.2 to 2.2", () => {
 		expect(cmp("2.2", "2.2")).toBe(0);
 	});

-	it("should be return 1 when comparing 1.1 to 1.0", function () {
+	it("should be return 1 when comparing 1.1 to 1.0", () => {
 		expect(cmp("1.1", "1.0")).toBe(1);
 	});
 });
--- a/tests/unit/functions/newsfeed_spec.js
+++ b/tests/unit/functions/newsfeed_spec.js
@@ -1,15 +0,0 @@
-describe("Functions into modules/default/newsfeed/newsfeed.js", function () {
-	// Fake for use by newsletter.js
-	Module = {};
-	Module.definitions = {};
-	Module.register = function (name, moduleDefinition) {
-		Module.definitions[name] = moduleDefinition;
-	};
-
-	beforeAll(function () {
-		// load newsfeed.js
-		require("../../../modules/default/newsfeed/newsfeed.js");
-	});
-
-	test.skip("skip", () => {});
-});
--- a/tests/unit/functions/server_functions_spec.js
+++ b/tests/unit/functions/server_functions_spec.js
@@ -0,0 +1,149 @@
+const { cors } = require("../../../js/server_functions");
+
+describe("server_functions tests", () => {
+	describe("The cors method", () => {
+		let fetchResponse;
+		let fetchResponseHeadersGet;
+		let fetchResponseHeadersText;
+		let corsResponse;
+		let request;
+
+		jest.mock("node-fetch");
+		let nodefetch = require("node-fetch");
+		let fetchMock;
+
+		beforeEach(() => {
+			nodefetch.mockReset();
+
+			fetchResponseHeadersGet = jest.fn(() => {});
+			fetchResponseHeadersText = jest.fn(() => {});
+			fetchResponse = {
+				headers: {
+					get: fetchResponseHeadersGet
+				},
+				text: fetchResponseHeadersText
+			};
+			jest.mock("node-fetch", () => jest.fn());
+			nodefetch.mockImplementation(() => fetchResponse);
+
+			fetchMock = nodefetch;
+
+			corsResponse = {
+				set: jest.fn(() => {}),
+				send: jest.fn(() => {})
+			};
+
+			request = {
+				url: `/cors?url=www.test.com`
+			};
+		});
+
+		test("Calls correct URL once", async () => {
+			const urlToCall = "http://www.test.com/path?param1=value1";
+			request.url = `/cors?url=${urlToCall}`;
+
+			await cors(request, corsResponse);
+
+			expect(fetchMock.mock.calls.length).toBe(1);
+			expect(fetchMock.mock.calls[0][0]).toBe(urlToCall);
+		});
+
+		test("Forewards Content-Type if json", async () => {
+			fetchResponseHeadersGet.mockImplementation(() => "json");
+
+			await cors(request, corsResponse);
+
+			expect(fetchResponseHeadersGet.mock.calls.length).toBe(1);
+			expect(fetchResponseHeadersGet.mock.calls[0][0]).toBe("Content-Type");
+
+			expect(corsResponse.set.mock.calls.length).toBe(1);
+			expect(corsResponse.set.mock.calls[0][0]).toBe("Content-Type");
+			expect(corsResponse.set.mock.calls[0][1]).toBe("json");
+		});
+
+		test("Forewards Content-Type if xml", async () => {
+			fetchResponseHeadersGet.mockImplementation(() => "xml");
+
+			await cors(request, corsResponse);
+
+			expect(fetchResponseHeadersGet.mock.calls.length).toBe(1);
+			expect(fetchResponseHeadersGet.mock.calls[0][0]).toBe("Content-Type");
+
+			expect(corsResponse.set.mock.calls.length).toBe(1);
+			expect(corsResponse.set.mock.calls[0][0]).toBe("Content-Type");
+			expect(corsResponse.set.mock.calls[0][1]).toBe("xml");
+		});
+
+		test("Sends correct data from response", async () => {
+			const responseData = "some data";
+			fetchResponseHeadersText.mockImplementation(() => responseData);
+
+			let sentData;
+			corsResponse.send = jest.fn((input) => {
+				sentData = input;
+			});
+
+			await cors(request, corsResponse);
+
+			expect(fetchResponseHeadersText.mock.calls.length).toBe(1);
+			expect(sentData).toBe(responseData);
+		});
+
+		test("Sends error data from response", async () => {
+			const error = new Error("error data");
+			fetchResponseHeadersText.mockImplementation(() => {
+				throw error;
+			});
+
+			let sentData;
+			corsResponse.send = jest.fn((input) => {
+				sentData = input;
+			});
+
+			await cors(request, corsResponse);
+
+			expect(fetchResponseHeadersText.mock.calls.length).toBe(1);
+			expect(sentData).toBe(error);
+		});
+
+		test("Fetches with user agent by default", async () => {
+			await cors(request, corsResponse);
+
+			expect(fetchMock.mock.calls.length).toBe(1);
+			expect(fetchMock.mock.calls[0][1]).toHaveProperty("headers");
+			expect(fetchMock.mock.calls[0][1].headers).toHaveProperty("User-Agent");
+		});
+
+		test("Fetches with specified headers", async () => {
+			const headersParam = "sendheaders=header1:value1,header2:value2";
+			const urlParam = "http://www.test.com/path?param1=value1";
+			request.url = `/cors?${headersParam}&url=${urlParam}`;
+
+			await cors(request, corsResponse);
+
+			expect(fetchMock.mock.calls.length).toBe(1);
+			expect(fetchMock.mock.calls[0][1]).toHaveProperty("headers");
+			expect(fetchMock.mock.calls[0][1].headers).toHaveProperty("header1", "value1");
+			expect(fetchMock.mock.calls[0][1].headers).toHaveProperty("header2", "value2");
+		});
+
+		test("Sends specified headers", async () => {
+			fetchResponseHeadersGet.mockImplementation((input) => input.replace("header", "value"));
+
+			const expectedheaders = "expectedheaders=header1,header2";
+			const urlParam = "http://www.test.com/path?param1=value1";
+			request.url = `/cors?${expectedheaders}&url=${urlParam}`;
+
+			await cors(request, corsResponse);
+
+			expect(fetchMock.mock.calls.length).toBe(1);
+			expect(fetchMock.mock.calls[0][1]).toHaveProperty("headers");
+			expect(corsResponse.set.mock.calls.length).toBe(3);
+			expect(corsResponse.set.mock.calls[0][0]).toBe("Content-Type");
+			expect(corsResponse.set.mock.calls[1][0]).toBe("header1");
+			expect(corsResponse.set.mock.calls[1][1]).toBe("value1");
+			expect(corsResponse.set.mock.calls[2][0]).toBe("header2");
+			expect(corsResponse.set.mock.calls[2][1]).toBe("value2");
+		});
+	});
+});
--- a/tests/unit/functions/updatenotification_spec.js
+++ b/tests/unit/functions/updatenotification_spec.js
@@ -14,7 +14,7 @@ jest.mock("logger", () => ({
 	info: jest.fn()
 }));

-describe("Updatenotification", function () {
+describe("Updatenotification", () => {
 	const execMock = jest.fn();

 	let gitHelper;
@@ -30,7 +30,7 @@ describe("Updatenotification", function () {
 	let gitFetchErr;
 	let gitRevListErr;

-	beforeAll(async function () {
+	beforeAll(async () => {
 		const { promisify } = require("util");
 		promisify.mockReturnValue(execMock);

@@ -38,7 +38,7 @@ describe("Updatenotification", function () {
 		gitHelper = new GitHelper();
 	});

-	beforeEach(function () {
+	beforeEach(() => {
 		gitRemoteOut = "";
 		gitRevParseOut = "";
 		gitStatusOut = "";
@@ -50,7 +50,7 @@ describe("Updatenotification", function () {
 		gitFetchErr = "";
 		gitRevListErr = "";

-		execMock.mockImplementation(function (command) {
+		execMock.mockImplementation((command) => {
 			if (command.includes("git remote -v")) {
 				return { stdout: gitRemoteOut, stderr: gitRemoteErr };
 			} else if (command.includes("git rev-parse HEAD")) {
@@ -65,7 +65,7 @@ describe("Updatenotification", function () {
 		});
 	});

-	afterEach(async function () {
+	afterEach(async () => {
 		gitHelper.gitRepos = [];

 		jest.clearAllMocks();
@@ -74,7 +74,7 @@ describe("Updatenotification", function () {
 	describe("default", () => {
 		const moduleName = "default";

-		beforeEach(async function () {
+		beforeEach(async () => {
 			gitRemoteOut = "origin\tgit@github.com:MichMich/MagicMirror.git (fetch)\norigin\tgit@github.com:MichMich/MagicMirror.git (push)\n";
 			gitRevParseOut = "332e429a41f1a2339afd4f0ae96dd125da6beada";
 			gitStatusOut = "## develop...origin/develop\n M tests/unit/functions/updatenotification_spec.js\n";
@@ -84,13 +84,13 @@ describe("Updatenotification", function () {
 			await gitHelper.add(moduleName);
 		});

-		it("returns status information", async function () {
+		it("returns status information", async () => {
 			const repos = await gitHelper.getRepos();
 			expect(repos[0]).toMatchSnapshot();
 			expect(execMock).toHaveBeenCalledTimes(5);
 		});

-		it("returns status information early if isBehindInStatus", async function () {
+		it("returns status information early if isBehindInStatus", async () => {
 			gitStatusOut = "## develop...origin/develop [behind 5]";

 			const repos = await gitHelper.getRepos();
@@ -98,7 +98,7 @@ describe("Updatenotification", function () {
 			expect(execMock).toHaveBeenCalledTimes(3);
 		});

-		it("excludes repo if status can't be retrieved", async function () {
+		it("excludes repo if status can't be retrieved", async () => {
 			const errorMessage = "Failed to retrieve status";
 			execMock.mockRejectedValueOnce(errorMessage);

@@ -109,7 +109,7 @@ describe("Updatenotification", function () {
 			expect(error).toHaveBeenCalledWith(`Failed to retrieve repo info for ${moduleName}: Failed to retrieve status`);
 		});

-		it("excludes repo if refs don't match regex", async function () {
+		it("excludes repo if refs don't match regex", async () => {
 			gitFetchErr = "";

 			const repos = await gitHelper.getRepos();
@@ -120,7 +120,7 @@ describe("Updatenotification", function () {
 	describe("custom module", () => {
 		const moduleName = "MMM-Fuel";

-		beforeEach(async function () {
+		beforeEach(async () => {
 			gitRemoteOut = `origin\thttps://github.com/fewieden/${moduleName}.git (fetch)\norigin\thttps://github.com/fewieden/${moduleName}.git (push)\n`;
 			gitRevParseOut = "9d8310163da94441073a93cead711ba43e8888d0";
 			gitStatusOut = "## master...origin/master";
@@ -130,7 +130,7 @@ describe("Updatenotification", function () {
 			await gitHelper.add(moduleName);
 		});

-		it("returns status information without hash", async function () {
+		it("returns status information without hash", async () => {
 			const repos = await gitHelper.getRepos();
 			expect(repos[0]).toMatchSnapshot();
 			expect(execMock).toHaveBeenCalledTimes(4);
--- a/tests/unit/functions/weather_object_spec.js
+++ b/tests/unit/functions/weather_object_spec.js
@@ -1,31 +1,46 @@
 const WeatherObject = require("../../../modules/default/weather/weatherobject.js");
+const WeatherUtils = require("../../../modules/default/weather/weatherutils.js");

 global.moment = require("moment-timezone");
 global.SunCalc = require("suncalc");

-describe("WeatherObject", function () {
+describe("WeatherObject", () => {
 	let originalTimeZone;
 	let weatherobject;

-	beforeAll(function () {
+	beforeAll(() => {
 		originalTimeZone = moment.tz.guess();
 		moment.tz.setDefault("Africa/Dar_es_Salaam");
-		weatherobject = new WeatherObject("metric", "metric", "metric", true);
+		weatherobject = new WeatherObject();
 	});

-	it("should return true for daytime at noon", function () {
+	it("should return true for daytime at noon", () => {
 		weatherobject.date = moment(12, "HH");
 		weatherobject.updateSunTime(-6.774877582342688, 37.63345667023327);
 		expect(weatherobject.isDayTime()).toBe(true);
 	});

-	it("should return false for daytime at midnight", function () {
+	it("should return false for daytime at midnight", () => {
 		weatherobject.date = moment(0, "HH");
 		weatherobject.updateSunTime(-6.774877582342688, 37.63345667023327);
 		expect(weatherobject.isDayTime()).toBe(false);
 	});

-	afterAll(function () {
+	afterAll(() => {
 		moment.tz.setDefault(originalTimeZone);
 	});
 });
+
+describe("WeatherObject", () => {
+	it("should convert windspeed correctly from mph to mps", () => {
+		expect(Math.round(WeatherUtils.convertWindToMetric(93.951324266285))).toBe(42);
+	});
+
+	it("should convert windspeed correctly from kmh to mps", () => {
+		expect(Math.round(WeatherUtils.convertWindToMs(151.2))).toBe(42);
+	});
+
+	it("should convert wind direction correctly from cardinal to value", () => {
+		expect(WeatherUtils.convertWindDirection("SSE")).toBe(157);
+	});
+});
--- a/tests/unit/global_vars/defaults_modules_spec.js
+++ b/tests/unit/global_vars/defaults_modules_spec.js
@@ -3,11 +3,11 @@ const path = require("path");

 const root_path = path.join(__dirname, "../../..");

-describe("Default modules set in modules/default/defaultmodules.js", function () {
+describe("Default modules set in modules/default/defaultmodules.js", () => {
 	const expectedDefaultModules = require("../../../modules/default/defaultmodules");

 	for (const defaultModule of expectedDefaultModules) {
-		it(`contains a folder for modules/default/${defaultModule}"`, function () {
+		it(`contains a folder for modules/default/${defaultModule}"`, () => {
 			expect(fs.existsSync(path.join(root_path, "modules/default", defaultModule))).toBe(true);
 		});
 	}
--- a/tests/unit/global_vars/root_path_spec.js
+++ b/tests/unit/global_vars/root_path_spec.js
@@ -4,24 +4,24 @@ const path = require("path");
 const root_path = path.join(__dirname, "../../..");
 const version = require(`${__dirname}/../../../package.json`).version;

-describe("'global.root_path' set in js/app.js", function () {
+describe("'global.root_path' set in js/app.js", () => {
 	const expectedSubPaths = ["modules", "serveronly", "js", "js/app.js", "js/main.js", "js/electron.js", "config"];

 	expectedSubPaths.forEach((subpath) => {
-		it(`contains a file/folder "${subpath}"`, function () {
+		it(`contains a file/folder "${subpath}"`, () => {
 			expect(fs.existsSync(path.join(root_path, subpath))).toBe(true);
 		});
 	});

-	it("should not modify global.root_path for testing", function () {
+	it("should not modify global.root_path for testing", () => {
 		expect(global.root_path).toBe(undefined);
 	});

-	it("should not modify global.version for testing", function () {
+	it("should not modify global.version for testing", () => {
 		expect(global.version).toBe(undefined);
 	});

-	it("should expect the global.version equals package.json file", function () {
+	it("should expect the global.version equals package.json file", () => {
 		const versionPackage = JSON.parse(fs.readFileSync("package.json", "utf8")).version;
 		expect(version).toBe(versionPackage);
 	});
--- a/tests/unit/modules/default/utils_spec.js
+++ b/tests/unit/modules/default/utils_spec.js
@@ -0,0 +1,111 @@
+const { performWebRequest } = require("../../../../modules/default/utils.js");
+const nodeVersion = process.version.match(/^v(\d+)\.*/)[1];
+
+describe("Utils tests", () => {
+	describe("The performWebRequest-method", () => {
+		if (nodeVersion > 18) {
+			const locationHost = "localhost:8080";
+			const locationProtocol = "http";
+
+			let fetchResponse;
+			let fetchMock;
+			let url;
+
+			beforeEach(() => {
+				fetchResponse = new Response();
+				global.fetch = jest.fn(() => Promise.resolve(fetchResponse));
+				fetchMock = global.fetch;
+
+				url = "www.test.com";
+			});
+
+			describe("When using cors proxy", () => {
+				Object.defineProperty(global, "location", {
+					value: {
+						host: locationHost,
+						protocol: locationProtocol
+					}
+				});
+
+				test("Calls correct URL once", async () => {
+					const urlToCall = "http://www.test.com/path?param1=value1";
+					url = urlToCall;
+
+					await performWebRequest(url, "json", true);
+
+					expect(fetchMock.mock.calls.length).toBe(1);
+					expect(fetchMock.mock.calls[0][0]).toBe(`${locationProtocol}//${locationHost}/cors?url=${urlToCall}`);
+				});
+
+				test("Sends correct headers", async () => {
+					const urlToCall = "http://www.test.com/path?param1=value1";
+					url = urlToCall;
+					const headers = [
+						{ name: "header1", value: "value1" },
+						{ name: "header2", value: "value2" }
+					];
+
+					await performWebRequest(url, "json", true, headers);
+
+					expect(fetchMock.mock.calls.length).toBe(1);
+					expect(fetchMock.mock.calls[0][0]).toBe(`${locationProtocol}//${locationHost}/cors?sendheaders=header1:value1,header2:value2&url=${urlToCall}`);
+				});
+			});
+
+			describe("When not using cors proxy", () => {
+				test("Calls correct URL once", async () => {
+					const urlToCall = "http://www.test.com/path?param1=value1";
+					url = urlToCall;
+
+					await performWebRequest(url);
+
+					expect(fetchMock.mock.calls.length).toBe(1);
+					expect(fetchMock.mock.calls[0][0]).toBe(urlToCall);
+				});
+
+				test("Sends correct headers", async () => {
+					const urlToCall = "http://www.test.com/path?param1=value1";
+					url = urlToCall;
+					const headers = [
+						{ name: "header1", value: "value1" },
+						{ name: "header2", value: "value2" }
+					];
+
+					await performWebRequest(url, "json", false, headers);
+
+					const expectedHeaders = { headers: { header1: "value1", header2: "value2" } };
+					expect(fetchMock.mock.calls.length).toBe(1);
+					expect(fetchMock.mock.calls[0][1]).toStrictEqual(expectedHeaders);
+				});
+			});
+
+			describe("When receiving json format", () => {
+				test("Returns undefined when no data is received", async () => {
+					const response = await performWebRequest(url);
+
+					expect(response).toBe(undefined);
+				});
+
+				test("Returns object when data is received", async () => {
+					fetchResponse = new Response('{"body": "some content"}');
+
+					const response = await performWebRequest(url);
+
+					expect(response.body).toBe("some content");
+				});
+
+				test("Returns expected headers when data is received", async () => {
+					fetchResponse = new Response('{"body": "some content"}', { headers: { header1: "value1", header2: "value2" } });
+
+					const response = await performWebRequest(url, "json", false, undefined, ["header1"]);
+
+					expect(response.headers.length).toBe(1);
+					expect(response.headers[0].name).toBe("header1");
+					expect(response.headers[0].value).toBe("value1");
+				});
+			});
+		} else {
+			test("Always ok, need one test", () => {});
+		}
+	});
+});