From 66759a33fa76177f08c9ed6344a2551767a71f8c Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Sun, 6 Jun 2021 23:13:09 +0200
Subject: [PATCH 01/22] unit tests

---
 js/logger.js                                  | 10 ++++---
 .../weatherforecast/weatherforecast.js        | 26 +++++++++++--------
 package.json                                  | 14 +++++++---
 tests/unit/classes/class_spec.js              |  6 ++---
 tests/unit/classes/translator_spec.js         | 16 ++++++++++--
 tests/unit/functions/calendar_spec.js         |  2 +-
 tests/unit/functions/cmp_versions_spec.js     |  2 +-
 tests/unit/functions/currentweather_spec.js   |  6 ++---
 tests/unit/functions/newsfeed_spec.js         |  4 ++-
 tests/unit/functions/weatherforecast_spec.js  | 18 ++++++-------
 .../unit/global_vars/defaults_modules_spec.js | 10 +++----
 tests/unit/global_vars/root_path_spec.js      | 14 +++++-----
 12 files changed, 78 insertions(+), 50 deletions(-)

diff --git a/js/logger.js b/js/logger.js
index 93a5bb53..1e74c850 100644
--- a/js/logger.js
+++ b/js/logger.js
@@ -22,7 +22,8 @@
 		root.Log = factory(root.config);
 	}
 })(this, function (config) {
-	const logLevel = {
+
+	let logLevel = {
 		debug: Function.prototype.bind.call(console.debug, console),
 		log: Function.prototype.bind.call(console.log, console),
 		info: Function.prototype.bind.call(console.info, console),
@@ -32,8 +33,11 @@
 		groupCollapsed: Function.prototype.bind.call(console.groupCollapsed, console),
 		groupEnd: Function.prototype.bind.call(console.groupEnd, console),
 		time: Function.prototype.bind.call(console.time, console),
-		timeEnd: Function.prototype.bind.call(console.timeEnd, console),
-		timeStamp: Function.prototype.bind.call(console.timeStamp, console)
+		timeEnd: Function.prototype.bind.call(console.timeEnd, console)
+	};
+
+	if (process.env.NODE_ENV.trim() !== "test") {
+		logLevel.push({timeStamp: Function.prototype.bind.call(console.timeStamp, console)});
 	};
 
 	logLevel.setLogLevel = function (newLevel) {
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index c180f5f5..39a7119b 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -339,7 +339,9 @@ Module.register("weatherforecast", {
 	 *
 	 * argument data object - Weather information received form openweather.org.
 	 */
-	processWeather: function (data) {
+	processWeather: function (data, momenttz) {
+		let mom;
+		if (momenttz === null) {mom = moment} else {mom = momenttz};
 		// Forcast16 (paid) API endpoint provides this data.  Onecall endpoint
 		// does not.
 		if (data.city) {
@@ -357,8 +359,8 @@ Module.register("weatherforecast", {
 		var dayEnds = 17;
 
 		if (data.city && data.city.sunrise && data.city.sunset) {
-			dayStarts = new Date(moment.unix(data.city.sunrise).locale("en").format("YYYY/MM/DD HH:mm:ss")).getHours();
-			dayEnds = new Date(moment.unix(data.city.sunset).locale("en").format("YYYY/MM/DD HH:mm:ss")).getHours();
+			dayStarts = new Date(mom.unix(data.city.sunrise).locale("en").format("YYYY/MM/DD HH:mm:ss")).getHours();
+			dayEnds = new Date(mom.unix(data.city.sunset).locale("en").format("YYYY/MM/DD HH:mm:ss")).getHours();
 		}
 
 		// Handle different structs between forecast16 and onecall endpoints
@@ -379,11 +381,11 @@ Module.register("weatherforecast", {
 			var day;
 			var hour;
 			if (forecast.dt_txt) {
-				day = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("ddd");
-				hour = new Date(moment(forecast.dt_txt).locale("en").format("YYYY-MM-DD HH:mm:ss")).getHours();
+				day = mom(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("ddd");
+				hour = new Date(mom(forecast.dt_txt).locale("en").format("YYYY-MM-DD HH:mm:ss")).getHours();
 			} else {
-				day = moment(forecast.dt, "X").format("ddd");
-				hour = new Date(moment(forecast.dt, "X")).getHours();
+				day = mom(forecast.dt, "X").format("ddd");
+				hour = new Date(mom(forecast.dt, "X")).getHours();
 			}
 
 			if (day !== lastDay) {
@@ -392,7 +394,7 @@ Module.register("weatherforecast", {
 					icon: this.config.iconTable[forecast.weather[0].icon],
 					maxTemp: this.roundValue(forecast.temp.max),
 					minTemp: this.roundValue(forecast.temp.min),
-					rain: this.processRain(forecast, forecastList)
+					rain: this.processRain(forecast, forecastList, mom)
 				};
 				this.forecast.push(forecastData);
 				lastDay = day;
@@ -482,16 +484,18 @@ Module.register("weatherforecast", {
 	 * That object has a property "3h" which contains the amount of rain since the previous forecast in the list.
 	 * This code finds all forecasts that is for the same day and sums the amount of rain and returns that.
 	 */
-	processRain: function (forecast, allForecasts) {
+	processRain: function (forecast, allForecasts, momenttz) {
+		let mom;
+		if (momenttz === null) {mom = moment} else {mom = momenttz};
 		//If the amount of rain actually is a number, return it
 		if (!isNaN(forecast.rain)) {
 			return forecast.rain;
 		}
 
 		//Find all forecasts that is for the same day
-		var checkDateTime = forecast.dt_txt ? moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(forecast.dt, "X");
+		var checkDateTime = forecast.dt_txt ? mom(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss") : mom(forecast.dt, "X");
 		var daysForecasts = allForecasts.filter(function (item) {
-			var itemDateTime = item.dt_txt ? moment(item.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(item.dt, "X");
+			var itemDateTime = item.dt_txt ? mom(item.dt_txt, "YYYY-MM-DD hh:mm:ss") : mom(item.dt, "X");
 			return itemDateTime.isSame(checkDateTime, "day") && item.rain instanceof Object;
 		});
 
diff --git a/package.json b/package.json
index 098b6efb..880fb3ef 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 		"test": "NODE_ENV=test mocha tests --recursive",
 		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text mocha tests --recursive --timeout=3000",
 		"test:e2e": "NODE_ENV=test mocha tests/e2e --recursive",
-		"test:unit": "NODE_ENV=test mocha tests/unit --recursive",
+		"test:unit": "NODE_ENV=test jest --testMatch **/tests/unit/**/*",
 		"test:prettier": "prettier . --check",
 		"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
 		"test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
@@ -52,11 +52,9 @@
 		"eslint-plugin-prettier": "^3.4.0",
 		"express-basic-auth": "^1.2.0",
 		"husky": "^6.0.0",
+		"jest": "27.0.4",
 		"jsdom": "^16.6.0",
 		"lodash": "^4.17.21",
-		"mocha": "^8.4.0",
-		"mocha-each": "^2.0.1",
-		"mocha-logger": "^1.0.7",
 		"nyc": "^15.1.0",
 		"prettier": "^2.3.0",
 		"pretty-quick": "^3.1.0",
@@ -93,5 +91,13 @@
 	},
 	"engines": {
 		"node": ">=12"
+	},
+	"jest": {
+		"moduleNameMapper": {
+			"node_helper": "<rootDir>/js/node_helper.js",
+			"logger": "<rootDir>/js/logger.js",
+			"moment-timezone": "<rootDir>/node_modules/moment-timezone/moment-timezone.js",
+			"moment": "<rootDir>/node_modules/moment/moment.js"
+		}
 	}
 }
diff --git a/tests/unit/classes/class_spec.js b/tests/unit/classes/class_spec.js
index b1af5c67..f7f41143 100644
--- a/tests/unit/classes/class_spec.js
+++ b/tests/unit/classes/class_spec.js
@@ -7,7 +7,7 @@ describe("File js/class", function () {
 		let clone;
 		let dom;
 
-		before(function (done) {
+		beforeAll(function (done) {
 			dom = new JSDOM(
 				`<script>var Log = {log: function() {}};</script>\
 					<script src="file://${path.join(__dirname, "..", "..", "..", "js", "class.js")}">`,
@@ -87,14 +87,14 @@ describe("File js/class", function () {
 		describe("Test lockstring code", function () {
 			let log;
 
-			before(function () {
+			beforeAll(function () {
 				log = dom.window.Log.log;
 				dom.window.Log.log = function cmp(str) {
 					expect(str).to.equal("lockStrings");
 				};
 			});
 
-			after(function () {
+			afterAll(function () {
 				dom.window.Log.log = log;
 			});
 
diff --git a/tests/unit/classes/translator_spec.js b/tests/unit/classes/translator_spec.js
index 2d64472d..297a0446 100644
--- a/tests/unit/classes/translator_spec.js
+++ b/tests/unit/classes/translator_spec.js
@@ -3,11 +3,12 @@ const path = require("path");
 const helmet = require("helmet");
 const { JSDOM } = require("jsdom");
 const express = require("express");
+const sockets = new Set();
 
 describe("Translator", function () {
 	let server;
 
-	before(function () {
+	beforeAll(function () {
 		const app = express();
 		app.use(helmet());
 		app.use(function (req, res, next) {
@@ -17,9 +18,20 @@ describe("Translator", function () {
 		app.use("/translations", express.static(path.join(__dirname, "..", "..", "..", "tests", "configs", "data")));
 
 		server = app.listen(3000);
+
+		server.on('connection', (socket) => {
+			sockets.add(socket);
+		});
+
 	});
 
-	after(function () {
+	afterAll(function () {
+		for (const socket of sockets) {
+			socket.destroy();
+	
+			sockets.delete(socket);
+		}
+
 		server.close();
 	});
 
diff --git a/tests/unit/functions/calendar_spec.js b/tests/unit/functions/calendar_spec.js
index 34dfb5e1..997c609c 100644
--- a/tests/unit/functions/calendar_spec.js
+++ b/tests/unit/functions/calendar_spec.js
@@ -10,7 +10,7 @@ describe("Functions into modules/default/calendar/calendar.js", function () {
 		Module.definitions[name] = moduleDefinition;
 	};
 
-	before(function () {
+	beforeAll(function () {
 		// load calendar.js
 		require("../../../modules/default/calendar/calendar.js");
 	});
diff --git a/tests/unit/functions/cmp_versions_spec.js b/tests/unit/functions/cmp_versions_spec.js
index 0fd41a12..a9f1bd23 100644
--- a/tests/unit/functions/cmp_versions_spec.js
+++ b/tests/unit/functions/cmp_versions_spec.js
@@ -5,7 +5,7 @@ const { JSDOM } = require("jsdom");
 describe("Test function cmpVersions in js/module.js", function () {
 	let cmp;
 
-	before(function (done) {
+	beforeAll(function (done) {
 		const dom = new JSDOM(
 			`<script>var Class = {extend: function() { return {}; }};</script>\
 				<script src="file://${path.join(__dirname, "..", "..", "..", "js", "module.js")}">`,
diff --git a/tests/unit/functions/currentweather_spec.js b/tests/unit/functions/currentweather_spec.js
index d5a96e3e..8a9e7cb3 100644
--- a/tests/unit/functions/currentweather_spec.js
+++ b/tests/unit/functions/currentweather_spec.js
@@ -10,14 +10,14 @@ describe("Functions module currentweather", function () {
 		Module.definitions[name] = moduleDefinition;
 	};
 
-	before(function () {
+	beforeAll(function () {
 		require("../../../modules/default/currentweather/currentweather.js");
 		Module.definitions.currentweather.config = {};
 	});
 
 	describe("roundValue", function () {
 		describe("this.config.roundTemp is true", function () {
-			before(function () {
+			beforeAll(function () {
 				Module.definitions.currentweather.config.roundTemp = true;
 			});
 
@@ -41,7 +41,7 @@ describe("Functions module currentweather", function () {
 		});
 
 		describe("this.config.roundTemp is false", function () {
-			before(function () {
+			beforeAll(function () {
 				Module.definitions.currentweather.config.roundTemp = false;
 			});
 
diff --git a/tests/unit/functions/newsfeed_spec.js b/tests/unit/functions/newsfeed_spec.js
index adbe6bf1..de3a44ad 100644
--- a/tests/unit/functions/newsfeed_spec.js
+++ b/tests/unit/functions/newsfeed_spec.js
@@ -8,8 +8,10 @@ describe("Functions into modules/default/newsfeed/newsfeed.js", function () {
 		Module.definitions[name] = moduleDefinition;
 	};
 
-	before(function () {
+	beforeAll(function () {
 		// load newsfeed.js
 		require("../../../modules/default/newsfeed/newsfeed.js");
 	});
+
+	test.skip('skip', () => {});
 });
diff --git a/tests/unit/functions/weatherforecast_spec.js b/tests/unit/functions/weatherforecast_spec.js
index 634bb488..c21b03cc 100644
--- a/tests/unit/functions/weatherforecast_spec.js
+++ b/tests/unit/functions/weatherforecast_spec.js
@@ -4,7 +4,7 @@ const moment = require("moment-timezone");
 const data = require("../../configs/data/weatherforecast_data.json");
 
 describe("Functions module weatherforecast", function () {
-	before(function () {
+	beforeAll(function () {
 		Module = {};
 		config = {};
 		Module.definitions = {};
@@ -17,7 +17,7 @@ describe("Functions module weatherforecast", function () {
 
 	describe("roundValue", function () {
 		describe("this.config.roundTemp is true", function () {
-			before(function () {
+			beforeAll(function () {
 				Module.definitions.weatherforecast.config.roundTemp = true;
 			});
 
@@ -41,7 +41,7 @@ describe("Functions module weatherforecast", function () {
 		});
 
 		describe("this.config.roundTemp is false", function () {
-			before(function () {
+			beforeAll(function () {
 				Module.definitions.weatherforecast.config.roundTemp = false;
 			});
 
@@ -73,7 +73,7 @@ describe("Functions module weatherforecast", function () {
 
 		let originalLocale;
 		let originalTimeZone;
-		before(function () {
+		beforeAll(function () {
 			originalLocale = moment.locale();
 			originalTimeZone = moment.tz.guess();
 			moment.locale("hi");
@@ -81,7 +81,7 @@ describe("Functions module weatherforecast", function () {
 		});
 
 		describe("forecastIcons sunset specified", function () {
-			before(function () {
+			beforeAll(function () {
 				Module.definitions.weatherforecast.Log = {};
 				Module.definitions.weatherforecast.forecast = [];
 				Module.definitions.weatherforecast.show = Module.definitions.weatherforecast.updateDom = function () {};
@@ -89,7 +89,7 @@ describe("Functions module weatherforecast", function () {
 			});
 
 			it(`returns correct icons with sunset time`, function () {
-				Module.definitions.weatherforecast.processWeather(data.withSunset);
+				Module.definitions.weatherforecast.processWeather(data.withSunset, moment);
 				let forecastData = Module.definitions.weatherforecast.forecast;
 				expect(forecastData.length).to.equal(4);
 				expect(forecastData[2].icon).to.equal("wi-rain");
@@ -97,19 +97,19 @@ describe("Functions module weatherforecast", function () {
 		});
 
 		describe("forecastIcons sunset not specified", function () {
-			before(function () {
+			beforeAll(function () {
 				Module.definitions.weatherforecast.forecast = [];
 			});
 
 			it(`returns correct icons with out sunset time`, function () {
-				Module.definitions.weatherforecast.processWeather(data.withoutSunset);
+				Module.definitions.weatherforecast.processWeather(data.withoutSunset, moment);
 				let forecastData = Module.definitions.weatherforecast.forecast;
 				expect(forecastData.length).to.equal(4);
 				expect(forecastData[2].icon).to.equal("wi-rain");
 			});
 		});
 
-		after(function () {
+		afterAll(function () {
 			moment.locale(originalLocale);
 			moment.tz.setDefault(originalTimeZone);
 		});
diff --git a/tests/unit/global_vars/defaults_modules_spec.js b/tests/unit/global_vars/defaults_modules_spec.js
index 7618a37d..8d783ff5 100644
--- a/tests/unit/global_vars/defaults_modules_spec.js
+++ b/tests/unit/global_vars/defaults_modules_spec.js
@@ -5,12 +5,12 @@ const vm = require("vm");
 
 const basedir = path.join(__dirname, "../../..");
 
-before(function () {
+beforeAll(function () {
 	const fileName = "js/app.js";
 	const filePath = path.join(basedir, fileName);
 	const code = fs.readFileSync(filePath);
 
-	this.sandbox = {
+	sandbox = {
 		module: {},
 		__dirname: path.dirname(filePath),
 		global: {},
@@ -27,13 +27,13 @@ before(function () {
 		}
 	};
 
-	this.sandbox.require = function (filename) {
+	sandbox.require = function (filename) {
 		// This modifies the global slightly,
 		// but supplies vm with essential code
 		return require(filename);
 	};
 
-	vm.runInNewContext(code, this.sandbox, fileName);
+	vm.runInNewContext(code, sandbox, fileName);
 });
 
 describe("Default modules set in modules/default/defaultmodules.js", function () {
@@ -41,7 +41,7 @@ describe("Default modules set in modules/default/defaultmodules.js", function ()
 
 	for (const defaultModule of expectedDefaultModules) {
 		it(`contains a folder for modules/default/${defaultModule}"`, function () {
-			expect(fs.existsSync(path.join(this.sandbox.global.root_path, "modules/default", defaultModule))).to.equal(true);
+			expect(fs.existsSync(path.join(sandbox.global.root_path, "modules/default", defaultModule))).to.equal(true);
 		});
 	}
 });
diff --git a/tests/unit/global_vars/root_path_spec.js b/tests/unit/global_vars/root_path_spec.js
index dc44b270..efe6f792 100644
--- a/tests/unit/global_vars/root_path_spec.js
+++ b/tests/unit/global_vars/root_path_spec.js
@@ -3,14 +3,14 @@ const path = require("path");
 const expect = require("chai").expect;
 const vm = require("vm");
 
-before(function () {
+beforeAll(function () {
 	const basedir = path.join(__dirname, "../../..");
 
 	const fileName = "js/app.js";
 	const filePath = path.join(basedir, fileName);
 	const code = fs.readFileSync(filePath);
 
-	this.sandbox = {
+	sandbox = {
 		module: {},
 		__dirname: path.dirname(filePath),
 		global: {},
@@ -27,16 +27,16 @@ before(function () {
 		}
 	};
 
-	this.sandbox.require = function (filename) {
+	sandbox.require = function (filename) {
 		// This modifies the global slightly,
 		// but supplies vm with essential code
 		return require(filename);
 	};
 
-	vm.runInNewContext(code, this.sandbox, fileName);
+	vm.runInNewContext(code, sandbox, fileName);
 });
 
-after(function () {
+afterAll(function () {
 	//console.log(global);
 });
 
@@ -45,7 +45,7 @@ describe("'global.root_path' set in js/app.js", function () {
 
 	expectedSubPaths.forEach((subpath) => {
 		it(`contains a file/folder "${subpath}"`, function () {
-			expect(fs.existsSync(path.join(this.sandbox.global.root_path, subpath))).to.equal(true);
+			expect(fs.existsSync(path.join(sandbox.global.root_path, subpath))).to.equal(true);
 		});
 	});
 
@@ -59,6 +59,6 @@ describe("'global.root_path' set in js/app.js", function () {
 
 	it("should expect the global.version equals package.json file", function () {
 		const versionPackage = JSON.parse(fs.readFileSync("package.json", "utf8")).version;
-		expect(this.sandbox.global.version).to.equal(versionPackage);
+		expect(sandbox.global.version).to.equal(versionPackage);
 	});
 });

From 16bbb42b8d3336e32379e99411bc0b47b6719bf8 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Tue, 8 Jun 2021 00:47:15 +0200
Subject: [PATCH 02/22] remove chai from unit tests

---
 tests/unit/classes/deprecated_spec.js         |  9 ++---
 tests/unit/classes/translator_spec.js         | 37 +++++++++----------
 tests/unit/classes/utils_spec.js              | 25 ++++++-------
 tests/unit/functions/calendar_spec.js         | 34 ++++++++---------
 tests/unit/functions/cmp_versions_spec.js     |  7 ++--
 tests/unit/functions/currentweather_spec.js   |  6 +--
 tests/unit/functions/newsfeed_spec.js         |  2 -
 tests/unit/functions/weatherforecast_spec.js  | 13 +++----
 .../unit/global_vars/defaults_modules_spec.js |  3 +-
 tests/unit/global_vars/root_path_spec.js      |  9 ++---
 10 files changed, 66 insertions(+), 79 deletions(-)

diff --git a/tests/unit/classes/deprecated_spec.js b/tests/unit/classes/deprecated_spec.js
index f31354c1..9dc3d64a 100644
--- a/tests/unit/classes/deprecated_spec.js
+++ b/tests/unit/classes/deprecated_spec.js
@@ -1,16 +1,15 @@
-const expect = require("chai").expect;
 const deprecated = require("../../../js/deprecated");
 
 describe("Deprecated", function () {
 	it("should be an object", function () {
-		expect(deprecated).to.be.an("object");
+		expect(typeof deprecated).toBe("object");
 	});
 
 	it("should contain configs array with deprecated options as strings", function () {
-		expect(deprecated.configs).to.be.an("array");
+		expect(Array.isArray(["deprecated.configs"])).toBe(true);
 		for (let option of deprecated.configs) {
-			expect(option).to.be.an("string");
+			expect(typeof option).toBe("string");
 		}
-		expect(deprecated.configs).to.include("kioskmode");
+		expect(deprecated.configs).toEqual(expect.arrayContaining(["kioskmode"]));
 	});
 });
diff --git a/tests/unit/classes/translator_spec.js b/tests/unit/classes/translator_spec.js
index 297a0446..df1934fe 100644
--- a/tests/unit/classes/translator_spec.js
+++ b/tests/unit/classes/translator_spec.js
@@ -1,4 +1,3 @@
-const expect = require("chai").expect;
 const path = require("path");
 const helmet = require("helmet");
 const { JSDOM } = require("jsdom");
@@ -82,9 +81,9 @@ describe("Translator", function () {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				let translation = Translator.translate({ name: "MMM-Module" }, "Hello");
-				expect(translation).to.be.equal("Hallo");
+				expect(translation).toBe("Hallo");
 				translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}", { username: "fewieden" });
-				expect(translation).to.be.equal("Hallo fewieden");
+				expect(translation).toBe("Hallo fewieden");
 				done();
 			};
 		});
@@ -95,9 +94,9 @@ describe("Translator", function () {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				let translation = Translator.translate({ name: "MMM-Module" }, "FOO");
-				expect(translation).to.be.equal("Foo");
+				expect(translation).toBe("Foo");
 				translation = Translator.translate({ name: "MMM-Module" }, "BAR {something}", { something: "Lorem Ipsum" });
-				expect(translation).to.be.equal("Bar Lorem Ipsum");
+				expect(translation).toBe("Bar Lorem Ipsum");
 				done();
 			};
 		});
@@ -108,7 +107,7 @@ describe("Translator", function () {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				const translation = Translator.translate({ name: "MMM-Module" }, "A key");
-				expect(translation).to.be.equal("A translation");
+				expect(translation).toBe("A translation");
 				done();
 			};
 		});
@@ -119,7 +118,7 @@ describe("Translator", function () {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				const translation = Translator.translate({ name: "MMM-Module" }, "Fallback");
-				expect(translation).to.be.equal("core fallback");
+				expect(translation).toBe("core fallback");
 				done();
 			};
 		});
@@ -130,7 +129,7 @@ describe("Translator", function () {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				const translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}");
-				expect(translation).to.be.equal("Hallo {username}");
+				expect(translation).toBe("Hallo {username}");
 				done();
 			};
 		});
@@ -141,7 +140,7 @@ describe("Translator", function () {
 				const { Translator } = dom.window;
 				setTranslations(Translator);
 				const translation = Translator.translate({ name: "MMM-Module" }, "MISSING");
-				expect(translation).to.be.equal("MISSING");
+				expect(translation).toBe("MISSING");
 				done();
 			};
 		});
@@ -163,7 +162,7 @@ describe("Translator", function () {
 
 				Translator.load(mmm, file, false, function () {
 					const json = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", file));
-					expect(Translator.translations[mmm.name]).to.be.deep.equal(json);
+					expect(Translator.translations[mmm.name]).toEqual(json);
 					done();
 				});
 			};
@@ -177,7 +176,7 @@ describe("Translator", function () {
 
 				Translator.load(mmm, file, true, function () {
 					const json = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", file));
-					expect(Translator.translationsFallback[mmm.name]).to.be.deep.equal(json);
+					expect(Translator.translationsFallback[mmm.name]).toEqual(json);
 					done();
 				});
 			};
@@ -198,8 +197,8 @@ describe("Translator", function () {
 				};
 
 				Translator.load(mmm, file, false, function () {
-					expect(Translator.translations[mmm.name]).to.be.equal(undefined);
-					expect(Translator.translationsFallback[mmm.name]).to.be.deep.equal({
+					expect(Translator.translations[mmm.name]).toBe(undefined);
+					expect(Translator.translationsFallback[mmm.name]).toEqual({
 						Hello: "Hallo"
 					});
 					done();
@@ -221,8 +220,8 @@ describe("Translator", function () {
 
 				const en = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", "en.json"));
 				setTimeout(function () {
-					expect(Translator.coreTranslations).to.be.deep.equal(en);
-					expect(Translator.coreTranslationsFallback).to.be.deep.equal(en);
+					expect(Translator.coreTranslations).toEqual(en);
+					expect(Translator.coreTranslationsFallback).toEqual(en);
 					done();
 				}, 500);
 			};
@@ -240,8 +239,8 @@ describe("Translator", function () {
 
 				const en = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", "en.json"));
 				setTimeout(function () {
-					expect(Translator.coreTranslations).to.be.deep.equal({});
-					expect(Translator.coreTranslationsFallback).to.be.deep.equal(en);
+					expect(Translator.coreTranslations).toEqual({});
+					expect(Translator.coreTranslationsFallback).toEqual(en);
 					done();
 				}, 500);
 			};
@@ -261,7 +260,7 @@ describe("Translator", function () {
 
 				const en = require(path.join(__dirname, "..", "..", "..", "tests", "configs", "data", "en.json"));
 				setTimeout(function () {
-					expect(Translator.coreTranslationsFallback).to.be.deep.equal(en);
+					expect(Translator.coreTranslationsFallback).toEqual(en);
 					done();
 				}, 500);
 			};
@@ -278,7 +277,7 @@ describe("Translator", function () {
 				Translator.loadCoreTranslations();
 
 				setTimeout(function () {
-					expect(Translator.coreTranslationsFallback).to.be.deep.equal({});
+					expect(Translator.coreTranslationsFallback).toEqual({});
 					done();
 				}, 500);
 			};
diff --git a/tests/unit/classes/utils_spec.js b/tests/unit/classes/utils_spec.js
index d41411d9..510c29c4 100644
--- a/tests/unit/classes/utils_spec.js
+++ b/tests/unit/classes/utils_spec.js
@@ -1,4 +1,3 @@
-const expect = require("chai").expect;
 const Utils = require("../../../js/utils.js");
 const colors = require("colors/safe");
 
@@ -11,29 +10,29 @@ describe("Utils", function () {
 		});
 
 		it("should have info, warn and error properties", function () {
-			expect(Utils.colors).to.have.property("info");
-			expect(Utils.colors).to.have.property("warn");
-			expect(Utils.colors).to.have.property("error");
+			expect(Utils.colors).toHaveProperty("info");
+			expect(Utils.colors).toHaveProperty("warn");
+			expect(Utils.colors).toHaveProperty("error");
 		});
 
 		it("properties should be functions", function () {
-			expect(Utils.colors.info).to.be.a("function");
-			expect(Utils.colors.warn).to.be.a("function");
-			expect(Utils.colors.error).to.be.a("function");
+			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 () {
 			colors.enabled = true;
-			expect(Utils.colors.info("some informations")).to.be.equal("\u001b[34msome informations\u001b[39m");
-			expect(Utils.colors.warn("a warning")).to.be.equal("\u001b[33ma warning\u001b[39m");
-			expect(Utils.colors.error("ERROR!")).to.be.equal("\u001b[31mERROR!\u001b[39m");
+			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 () {
 			colors.enabled = false;
-			expect(Utils.colors.info("some informations")).to.be.equal("some informations");
-			expect(Utils.colors.warn("a warning")).to.be.equal("a warning");
-			expect(Utils.colors.error("ERROR!")).to.be.equal("ERROR!");
+			expect(Utils.colors.info("some informations")).toBe("some informations");
+			expect(Utils.colors.warn("a warning")).toBe("a warning");
+			expect(Utils.colors.error("ERROR!")).toBe("ERROR!");
 		});
 	});
 });
diff --git a/tests/unit/functions/calendar_spec.js b/tests/unit/functions/calendar_spec.js
index 997c609c..073bdcd0 100644
--- a/tests/unit/functions/calendar_spec.js
+++ b/tests/unit/functions/calendar_spec.js
@@ -1,5 +1,3 @@
-const expect = require("chai").expect;
-
 global.moment = require("moment");
 
 describe("Functions into modules/default/calendar/calendar.js", function () {
@@ -26,63 +24,63 @@ describe("Functions into modules/default/calendar/calendar.js", function () {
 
 		Object.keys(words).forEach((word) => {
 			it(`for '${word}' should return '${words[word]}'`, function () {
-				expect(Module.definitions.calendar.capFirst(word)).to.equal(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 () {
-			expect(Module.definitions.calendar.getLocaleSpecification(12)).to.deep.equal({ longDateFormat: { LT: "h:mm A" } });
+			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 () {
-			expect(Module.definitions.calendar.getLocaleSpecification(24)).to.deep.equal({ longDateFormat: { LT: "HH:mm" } });
+			expect(Module.definitions.calendar.getLocaleSpecification(24)).toEqual({ longDateFormat: { LT: "HH:mm" } });
 		});
 
 		it("should return the current system locale when called without timeFormat number", function () {
-			expect(Module.definitions.calendar.getLocaleSpecification()).to.deep.equal({ longDateFormat: { LT: moment.localeData().longDateFormat("LT") } });
+			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 () {
 			const localeBackup = moment.locale();
 			moment.locale("en");
-			expect(Module.definitions.calendar.getLocaleSpecification()).to.deep.equal({ longDateFormat: { LT: "h:mm A" } });
+			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 () {
 			const localeBackup = moment.locale();
 			moment.locale("au");
-			expect(Module.definitions.calendar.getLocaleSpecification()).to.deep.equal({ longDateFormat: { LT: "h:mm A" } });
+			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 () {
 			const localeBackup = moment.locale();
 			moment.locale("eg");
-			expect(Module.definitions.calendar.getLocaleSpecification()).to.deep.equal({ longDateFormat: { LT: "h:mm A" } });
+			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 () {
 			const localeBackup = moment.locale();
 			moment.locale("nl");
-			expect(Module.definitions.calendar.getLocaleSpecification()).to.deep.equal({ longDateFormat: { LT: "HH:mm" } });
+			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 () {
 			const localeBackup = moment.locale();
 			moment.locale("fr");
-			expect(Module.definitions.calendar.getLocaleSpecification()).to.deep.equal({ longDateFormat: { LT: "HH:mm" } });
+			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 () {
 			const localeBackup = moment.locale();
 			moment.locale("uk");
-			expect(Module.definitions.calendar.getLocaleSpecification()).to.deep.equal({ longDateFormat: { LT: "HH:mm" } });
+			expect(Module.definitions.calendar.getLocaleSpecification()).toEqual({ longDateFormat: { LT: "HH:mm" } });
 			moment.locale(localeBackup);
 		});
 	});
@@ -97,32 +95,32 @@ describe("Functions into modules/default/calendar/calendar.js", function () {
 
 		Object.keys(strings).forEach((string) => {
 			it(`for '${string}' should return '${strings[string].return}'`, function () {
-				expect(Module.definitions.calendar.shorten(string, strings[string].length)).to.equal(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 () {
-			expect(Module.definitions.calendar.shorten(100)).to.equal("");
+			expect(Module.definitions.calendar.shorten(100)).toBe("");
 		});
 
 		it("should not shorten the string if shorten is called with a non-number maxLength", function () {
-			expect(Module.definitions.calendar.shorten("This is a test string", "This is not a number")).to.equal("This is a test string");
+			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 () {
-			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)).to.equal(
+			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 () {
-			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)).to.equal(
+			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 () {
-			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)).to.equal(
+			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;"
 			);
 		});
diff --git a/tests/unit/functions/cmp_versions_spec.js b/tests/unit/functions/cmp_versions_spec.js
index a9f1bd23..65dbcd92 100644
--- a/tests/unit/functions/cmp_versions_spec.js
+++ b/tests/unit/functions/cmp_versions_spec.js
@@ -1,4 +1,3 @@
-const expect = require("chai").expect;
 const path = require("path");
 const { JSDOM } = require("jsdom");
 
@@ -19,14 +18,14 @@ describe("Test function cmpVersions in js/module.js", function () {
 	});
 
 	it("should return -1 when comparing 2.1 to 2.2", function () {
-		expect(cmp("2.1", "2.2")).to.equal(-1);
+		expect(cmp("2.1", "2.2")).toBe(-1);
 	});
 
 	it("should be return 0 when comparing 2.2 to 2.2", function () {
-		expect(cmp("2.2", "2.2")).to.equal(0);
+		expect(cmp("2.2", "2.2")).toBe(0);
 	});
 
 	it("should be return 1 when comparing 1.1 to 1.0", function () {
-		expect(cmp("1.1", "1.0")).to.equal(1);
+		expect(cmp("1.1", "1.0")).toBe(1);
 	});
 });
diff --git a/tests/unit/functions/currentweather_spec.js b/tests/unit/functions/currentweather_spec.js
index 8a9e7cb3..534c942f 100644
--- a/tests/unit/functions/currentweather_spec.js
+++ b/tests/unit/functions/currentweather_spec.js
@@ -1,6 +1,4 @@
 /* eslint no-multi-spaces: 0 */
-const expect = require("chai").expect;
-
 describe("Functions module currentweather", function () {
 	// Fake for use by currentweather.js
 	Module = {};
@@ -35,7 +33,7 @@ describe("Functions module currentweather", function () {
 
 			values.forEach((value) => {
 				it(`for ${value[0]} should be return ${value[1]}`, function () {
-					expect(Module.definitions.currentweather.roundValue(value[0])).to.equal(value[1]);
+					expect(Module.definitions.currentweather.roundValue(value[0])).toBe(value[1]);
 				});
 			});
 		});
@@ -60,7 +58,7 @@ describe("Functions module currentweather", function () {
 
 			values.forEach((value) => {
 				it(`for ${value[0]} should be return ${value[1]}`, function () {
-					expect(Module.definitions.currentweather.roundValue(value[0])).to.equal(value[1]);
+					expect(Module.definitions.currentweather.roundValue(value[0])).toBe(value[1]);
 				});
 			});
 		});
diff --git a/tests/unit/functions/newsfeed_spec.js b/tests/unit/functions/newsfeed_spec.js
index de3a44ad..5ba3c55c 100644
--- a/tests/unit/functions/newsfeed_spec.js
+++ b/tests/unit/functions/newsfeed_spec.js
@@ -1,5 +1,3 @@
-const expect = require("chai").expect;
-
 describe("Functions into modules/default/newsfeed/newsfeed.js", function () {
 	// Fake for use by newsletter.js
 	Module = {};
diff --git a/tests/unit/functions/weatherforecast_spec.js b/tests/unit/functions/weatherforecast_spec.js
index c21b03cc..e489c874 100644
--- a/tests/unit/functions/weatherforecast_spec.js
+++ b/tests/unit/functions/weatherforecast_spec.js
@@ -1,5 +1,4 @@
 /* eslint no-multi-spaces: 0 */
-const expect = require("chai").expect;
 const moment = require("moment-timezone");
 const data = require("../../configs/data/weatherforecast_data.json");
 
@@ -35,7 +34,7 @@ describe("Functions module weatherforecast", function () {
 
 			values.forEach((value) => {
 				it(`for ${value[0]} should be return ${value[1]}`, function () {
-					expect(Module.definitions.weatherforecast.roundValue(value[0])).to.equal(value[1]);
+					expect(Module.definitions.weatherforecast.roundValue(value[0])).toBe(value[1]);
 				});
 			});
 		});
@@ -60,7 +59,7 @@ describe("Functions module weatherforecast", function () {
 
 			values.forEach((value) => {
 				it(`for ${value[0]} should be return ${value[1]}`, function () {
-					expect(Module.definitions.weatherforecast.roundValue(value[0])).to.equal(value[1]);
+					expect(Module.definitions.weatherforecast.roundValue(value[0])).toBe(value[1]);
 				});
 			});
 		});
@@ -91,8 +90,8 @@ describe("Functions module weatherforecast", function () {
 			it(`returns correct icons with sunset time`, function () {
 				Module.definitions.weatherforecast.processWeather(data.withSunset, moment);
 				let forecastData = Module.definitions.weatherforecast.forecast;
-				expect(forecastData.length).to.equal(4);
-				expect(forecastData[2].icon).to.equal("wi-rain");
+				expect(forecastData.length).toBe(4);
+				expect(forecastData[2].icon).toBe("wi-rain");
 			});
 		});
 
@@ -104,8 +103,8 @@ describe("Functions module weatherforecast", function () {
 			it(`returns correct icons with out sunset time`, function () {
 				Module.definitions.weatherforecast.processWeather(data.withoutSunset, moment);
 				let forecastData = Module.definitions.weatherforecast.forecast;
-				expect(forecastData.length).to.equal(4);
-				expect(forecastData[2].icon).to.equal("wi-rain");
+				expect(forecastData.length).toBe(4);
+				expect(forecastData[2].icon).toBe("wi-rain");
 			});
 		});
 
diff --git a/tests/unit/global_vars/defaults_modules_spec.js b/tests/unit/global_vars/defaults_modules_spec.js
index 8d783ff5..e3e53d3f 100644
--- a/tests/unit/global_vars/defaults_modules_spec.js
+++ b/tests/unit/global_vars/defaults_modules_spec.js
@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const expect = require("chai").expect;
 const vm = require("vm");
 
 const basedir = path.join(__dirname, "../../..");
@@ -41,7 +40,7 @@ describe("Default modules set in modules/default/defaultmodules.js", function ()
 
 	for (const defaultModule of expectedDefaultModules) {
 		it(`contains a folder for modules/default/${defaultModule}"`, function () {
-			expect(fs.existsSync(path.join(sandbox.global.root_path, "modules/default", defaultModule))).to.equal(true);
+			expect(fs.existsSync(path.join(sandbox.global.root_path, "modules/default", defaultModule))).toBe(true);
 		});
 	}
 });
diff --git a/tests/unit/global_vars/root_path_spec.js b/tests/unit/global_vars/root_path_spec.js
index efe6f792..386ae389 100644
--- a/tests/unit/global_vars/root_path_spec.js
+++ b/tests/unit/global_vars/root_path_spec.js
@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const expect = require("chai").expect;
 const vm = require("vm");
 
 beforeAll(function () {
@@ -45,20 +44,20 @@ describe("'global.root_path' set in js/app.js", function () {
 
 	expectedSubPaths.forEach((subpath) => {
 		it(`contains a file/folder "${subpath}"`, function () {
-			expect(fs.existsSync(path.join(sandbox.global.root_path, subpath))).to.equal(true);
+			expect(fs.existsSync(path.join(sandbox.global.root_path, subpath))).toBe(true);
 		});
 	});
 
 	it("should not modify global.root_path for testing", function () {
-		expect(global.root_path).to.equal(undefined);
+		expect(global.root_path).toBe(undefined);
 	});
 
 	it("should not modify global.version for testing", function () {
-		expect(global.version).to.equal(undefined);
+		expect(global.version).toBe(undefined);
 	});
 
 	it("should expect the global.version equals package.json file", function () {
 		const versionPackage = JSON.parse(fs.readFileSync("package.json", "utf8")).version;
-		expect(sandbox.global.version).to.equal(versionPackage);
+		expect(sandbox.global.version).toBe(versionPackage);
 	});
 });

From 67011c0c32f4edcd5929b03eee0b4f419211d081 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Tue, 8 Jun 2021 00:47:40 +0200
Subject: [PATCH 03/22] snapshot e2e

---
 package.json                          |  7 ++--
 tests/e2e/dev_console.js              | 51 +++++++++++++--------------
 tests/e2e/env_spec.js                 | 23 ++++++------
 tests/e2e/fonts.js                    |  4 +--
 tests/e2e/global-setup.js             |  6 ++--
 tests/e2e/ipWhistlist_spec.js         |  4 +--
 tests/e2e/modules/alert_spec.js       |  2 +-
 tests/e2e/modules/calendar_spec.js    | 20 +++++------
 tests/e2e/modules/clock_es_spec.js    |  8 ++---
 tests/e2e/modules/clock_spec.js       | 12 +++----
 tests/e2e/modules/compliments_spec.js |  8 ++---
 tests/e2e/modules/helloworld_spec.js  |  4 +--
 tests/e2e/modules/newsfeed_spec.js    |  6 ++--
 tests/e2e/modules/weather_spec.js     | 18 +++++-----
 tests/e2e/modules_display_spec.js     |  2 +-
 tests/e2e/modules_position_spec.js    |  4 +--
 tests/e2e/port_config.js              |  6 ++--
 tests/e2e/translations_spec.js        |  8 ++---
 tests/e2e/vendor_spec.js              |  4 +--
 tests/e2e/without_modules.js          |  2 +-
 20 files changed, 97 insertions(+), 102 deletions(-)

diff --git a/package.json b/package.json
index 880fb3ef..0f1fd8f1 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"",
 		"test": "NODE_ENV=test mocha tests --recursive",
 		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text mocha tests --recursive --timeout=3000",
-		"test:e2e": "NODE_ENV=test mocha tests/e2e --recursive",
+		"test:e2e": "NODE_ENV=test jest --testMatch **/tests/e2e/**/*",
 		"test:unit": "NODE_ENV=test jest --testMatch **/tests/unit/**/*",
 		"test:prettier": "prettier . --check",
 		"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
@@ -45,8 +45,6 @@
 	},
 	"homepage": "https://magicmirror.builders",
 	"devDependencies": {
-		"chai": "^4.3.4",
-		"chai-as-promised": "^7.1.1",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-jsdoc": "^35.0.0",
 		"eslint-plugin-prettier": "^3.4.0",
@@ -95,7 +93,8 @@
 	"jest": {
 		"moduleNameMapper": {
 			"node_helper": "<rootDir>/js/node_helper.js",
-			"logger": "<rootDir>/js/logger.js",
+			// "logger": "<rootDir>/js/logger.js", <-- only for unit tests, not for e2e
+			// replace require("chai").expect with expect from jest, see e2e/env_spec.js
 			"moment-timezone": "<rootDir>/node_modules/moment-timezone/moment-timezone.js",
 			"moment": "<rootDir>/node_modules/moment/moment.js"
 		}
diff --git a/tests/e2e/dev_console.js b/tests/e2e/dev_console.js
index e6400bef..fe5b5976 100644
--- a/tests/e2e/dev_console.js
+++ b/tests/e2e/dev_console.js
@@ -5,22 +5,17 @@ const describe = global.describe;
 const it = global.it;
 
 describe("Development console tests", function () {
-	// FIXME: This tests fail and crash another tests
-	// Suspect problem with window focus
-	return false;
-
-	/* eslint-disable */
 	helpers.setupTimeout(this);
 
 	let app = null;
 
-	before(function () {
+	beforeAll(function () {
 		// Set config sample for use in test
 		process.env.MM_CONFIG_FILE = "tests/configs/env.js";
 	});
 
 	describe("Without 'dev' commandline argument", function () {
-		before(function () {
+		beforeAll(function () {
 			return helpers
 				.startApplication({
 					args: ["js/electron.js"]
@@ -30,33 +25,35 @@ describe("Development console tests", function () {
 				});
 		});
 
-		after(function () {
+		afterAll(function () {
 			return helpers.stopApplication(app);
 		});
 
-		it("should not open dev console when absent", function () {
+		it("should not open dev console when absent", async function () {
+			await app.client.waitUntilWindowLoaded();
 			return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(false);
 		});
 	});
 
-	describe("With 'dev' commandline argument", function () {
-		before(function () {
-			return helpers
-				.startApplication({
-					args: ["js/electron.js", "dev"]
-				})
-				.then(function (startedApp) {
-					app = startedApp;
-				});
-		});
+	// describe("With 'dev' commandline argument", function () {
+	// 	beforeAll(function () {
+	// 		return helpers
+	// 			.startApplication({
+	// 				args: ["js/electron.js", "dev"]
+	// 			})
+	// 			.then(function (startedApp) {
+	// 				app = startedApp;
+	// 			});
+	// 	});
 
-		after(function () {
-			return helpers.stopApplication(app);
-		});
+	// 	afterAll(function () {
+	// 		return helpers.stopApplication(app);
+	// 	});
 
-		it("should open dev console when provided", function () {
-			return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(true);
-		});
-	});
-	/* eslint-enable */
+	// 	it("should open dev console when provided", async function () {
+	// 		expect(await app.client.getWindowCount()).to.equal(2);
+	// 		await app.client.waitUntilWindowLoaded();
+	// 		return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(true);
+	// 	});
+	// });
 });
diff --git a/tests/e2e/env_spec.js b/tests/e2e/env_spec.js
index 1ec4a086..8d9da80d 100644
--- a/tests/e2e/env_spec.js
+++ b/tests/e2e/env_spec.js
@@ -1,6 +1,5 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
-const expect = require("chai").expect;
 
 const describe = global.describe;
 const it = global.it;
@@ -12,7 +11,7 @@ describe("Electron app environment", function () {
 
 	let app = null;
 
-	before(function () {
+	beforeAll(function () {
 		// Set config sample for use in test
 		process.env.MM_CONFIG_FILE = "tests/configs/env.js";
 	});
@@ -34,27 +33,27 @@ describe("Electron app environment", function () {
 	it("should open a browserwindow", async function () {
 		await app.client.waitUntilWindowLoaded();
 		app.browserWindow.focus();
-		expect(await app.client.getWindowCount()).to.equal(1);
-		expect(await app.browserWindow.isMinimized()).to.be.false;
-		expect(await app.browserWindow.isDevToolsOpened()).to.be.false;
-		expect(await app.browserWindow.isVisible()).to.be.true;
-		expect(await app.browserWindow.isFocused()).to.be.true;
+		expect(await app.client.getWindowCount()).toBe(1);
+		expect(await app.browserWindow.isMinimized()).toBe(false);
+		expect(await app.browserWindow.isDevToolsOpened()).toBe(false);
+		expect(await app.browserWindow.isVisible()).toBe(true);
+		expect(await app.browserWindow.isFocused()).toBe(true);
 		const bounds = await app.browserWindow.getBounds();
-		expect(bounds.width).to.be.above(0);
-		expect(bounds.height).to.be.above(0);
-		expect(await app.browserWindow.getTitle()).to.equal("MagicMirror²");
+		expect(bounds.width).toBeGreaterThan(0);
+		expect(bounds.height).toBeGreaterThan(0);
+		expect(await app.browserWindow.getTitle()).toBe("MagicMirror²");
 	});
 
 	it("get request from http://localhost:8080 should return 200", function (done) {
 		fetch("http://localhost:8080").then((res) => {
-			expect(res.status).to.equal(200);
+			expect(res.status).toBe(200);
 			done();
 		});
 	});
 
 	it("get request from http://localhost:8080/nothing should return 404", function (done) {
 		fetch("http://localhost:8080/nothing").then((res) => {
-			expect(res.status).to.equal(404);
+			expect(res.status).toBe(404);
 			done();
 		});
 	});
diff --git a/tests/e2e/fonts.js b/tests/e2e/fonts.js
index d6d65c0b..8848cfcb 100644
--- a/tests/e2e/fonts.js
+++ b/tests/e2e/fonts.js
@@ -21,7 +21,7 @@ describe("All font files from roboto.css should be downloadable", function () {
 		match = regex.exec(fileContent);
 	}
 
-	before(function () {
+	beforeAll(function () {
 		// Set config sample for use in test
 		process.env.MM_CONFIG_FILE = "tests/configs/without_modules.js";
 
@@ -34,7 +34,7 @@ describe("All font files from roboto.css should be downloadable", function () {
 			});
 	});
 
-	after(function () {
+	afterAll(function () {
 		return helpers.stopApplication(app);
 	});
 
diff --git a/tests/e2e/global-setup.js b/tests/e2e/global-setup.js
index 801c61e5..0f5ad57e 100644
--- a/tests/e2e/global-setup.js
+++ b/tests/e2e/global-setup.js
@@ -10,7 +10,7 @@ const chai = require("chai");
 const chaiAsPromised = require("chai-as-promised");
 const path = require("path");
 
-global.before(function () {
+global.beforeAll(function () {
 	chai.should();
 	chai.use(chaiAsPromised);
 });
@@ -26,9 +26,9 @@ exports.getElectronPath = function () {
 // Set timeout - if this is run within Travis, increase timeout
 exports.setupTimeout = function (test) {
 	if (process.env.CI) {
-		test.timeout(30000);
+		jest.setTimeout(30000);
 	} else {
-		test.timeout(10000);
+		jest.setTimeout(10000);
 	}
 };
 
diff --git a/tests/e2e/ipWhistlist_spec.js b/tests/e2e/ipWhistlist_spec.js
index 1c259f1e..64d7ebe6 100644
--- a/tests/e2e/ipWhistlist_spec.js
+++ b/tests/e2e/ipWhistlist_spec.js
@@ -27,7 +27,7 @@ describe("ipWhitelist directive configuration", function () {
 	});
 
 	describe("Set ipWhitelist without access", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/noIpWhiteList.js";
 		});
@@ -41,7 +41,7 @@ describe("ipWhitelist directive configuration", function () {
 	});
 
 	describe("Set ipWhitelist []", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/empty_ipWhiteList.js";
 		});
diff --git a/tests/e2e/modules/alert_spec.js b/tests/e2e/modules/alert_spec.js
index 515001bf..90322d26 100644
--- a/tests/e2e/modules/alert_spec.js
+++ b/tests/e2e/modules/alert_spec.js
@@ -25,7 +25,7 @@ describe("Alert module", function () {
 	});
 
 	describe("Default configuration", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/alert/default.js";
 		});
diff --git a/tests/e2e/modules/calendar_spec.js b/tests/e2e/modules/calendar_spec.js
index 097ce220..d2c2ece9 100644
--- a/tests/e2e/modules/calendar_spec.js
+++ b/tests/e2e/modules/calendar_spec.js
@@ -27,7 +27,7 @@ describe("Calendar module", function () {
 	});
 
 	describe("Default configuration", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/default.js";
 		});
@@ -46,7 +46,7 @@ describe("Calendar module", function () {
 	});
 
 	describe("Custom configuration", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/custom.js";
 		});
@@ -77,7 +77,7 @@ describe("Calendar module", function () {
 	});
 
 	describe("Recurring event", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/recurring.js";
 		});
@@ -90,13 +90,13 @@ describe("Calendar module", function () {
 	});
 
 	describe("Changed port", function () {
-		before(function () {
+		beforeAll(function () {
 			serverBasicAuth.listen(8010);
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/changed-port.js";
 		});
 
-		after(function (done) {
+		afterAll(function (done) {
 			serverBasicAuth.close(done());
 		});
 
@@ -106,7 +106,7 @@ describe("Calendar module", function () {
 	});
 
 	describe("Basic auth", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/basic-auth.js";
 		});
@@ -117,7 +117,7 @@ describe("Calendar module", function () {
 	});
 
 	describe("Basic auth by default", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/auth-default.js";
 		});
@@ -128,7 +128,7 @@ describe("Calendar module", function () {
 	});
 
 	describe("Basic auth backward compatibility configuration: DEPRECATED", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/old-basic-auth.js";
 		});
@@ -139,13 +139,13 @@ describe("Calendar module", function () {
 	});
 
 	describe("Fail Basic auth", function () {
-		before(function () {
+		beforeAll(function () {
 			serverBasicAuth.listen(8020);
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/fail-basic-auth.js";
 		});
 
-		after(function (done) {
+		afterAll(function (done) {
 			serverBasicAuth.close(done());
 		});
 
diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index 5ef491a3..a2622fb6 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -25,7 +25,7 @@ describe("Clock set to spanish language module", function () {
 	});
 
 	describe("with default 24hr clock config", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_24hr.js";
 		});
@@ -44,7 +44,7 @@ describe("Clock set to spanish language module", function () {
 	});
 
 	describe("with default 12hr clock config", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_12hr.js";
 		});
@@ -63,7 +63,7 @@ describe("Clock set to spanish language module", function () {
 	});
 
 	describe("with showPeriodUpper config enabled", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_showPeriodUpper.js";
 		});
@@ -76,7 +76,7 @@ describe("Clock set to spanish language module", function () {
 	});
 
 	describe("with showWeek config enabled", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_showWeek.js";
 		});
diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js
index 27536dc2..ff614cf7 100644
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -27,7 +27,7 @@ describe("Clock module", function () {
 	});
 
 	describe("with default 24hr clock config", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_24hr.js";
 		});
@@ -46,7 +46,7 @@ describe("Clock module", function () {
 	});
 
 	describe("with default 12hr clock config", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_12hr.js";
 		});
@@ -65,7 +65,7 @@ describe("Clock module", function () {
 	});
 
 	describe("with showPeriodUpper config enabled", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_showPeriodUpper.js";
 		});
@@ -78,7 +78,7 @@ describe("Clock module", function () {
 	});
 
 	describe("with displaySeconds config disabled", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_displaySeconds_false.js";
 		});
@@ -91,7 +91,7 @@ describe("Clock module", function () {
 	});
 
 	describe("with showWeek config enabled", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_showWeek.js";
 		});
@@ -111,7 +111,7 @@ describe("Clock module", function () {
 	});
 
 	describe("with analog clock face enabled", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_analog.js";
 		});
diff --git a/tests/e2e/modules/compliments_spec.js b/tests/e2e/modules/compliments_spec.js
index 1eed2b8d..067bab1c 100644
--- a/tests/e2e/modules/compliments_spec.js
+++ b/tests/e2e/modules/compliments_spec.js
@@ -26,7 +26,7 @@ describe("Compliments module", function () {
 	});
 
 	describe("parts of days", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_parts_day.js";
 		});
@@ -67,7 +67,7 @@ describe("Compliments module", function () {
 
 	describe("Feature anytime in compliments module", function () {
 		describe("Set anytime and empty compliments for morning, evening and afternoon ", function () {
-			before(function () {
+			beforeAll(function () {
 				// Set config sample for use in test
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_anytime.js";
 			});
@@ -81,7 +81,7 @@ describe("Compliments module", function () {
 		});
 
 		describe("Only anytime present in configuration compliments", function () {
-			before(function () {
+			beforeAll(function () {
 				// Set config sample for use in test
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_only_anytime.js";
 			});
@@ -97,7 +97,7 @@ describe("Compliments module", function () {
 
 	describe("Feature date in compliments module", function () {
 		describe("Set date and empty compliments for anytime, morning, evening and afternoon", function () {
-			before(function () {
+			beforeAll(function () {
 				// Set config sample for use in test
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_date.js";
 			});
diff --git a/tests/e2e/modules/helloworld_spec.js b/tests/e2e/modules/helloworld_spec.js
index 6a744e51..a1ea7c44 100644
--- a/tests/e2e/modules/helloworld_spec.js
+++ b/tests/e2e/modules/helloworld_spec.js
@@ -25,7 +25,7 @@ describe("Test helloworld module", function () {
 	});
 
 	describe("helloworld set config text", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/helloworld/helloworld.js";
 		});
@@ -37,7 +37,7 @@ describe("Test helloworld module", function () {
 	});
 
 	describe("helloworld default config text", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/helloworld/helloworld_default.js";
 		});
diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js
index fc8c7122..7ca67a99 100644
--- a/tests/e2e/modules/newsfeed_spec.js
+++ b/tests/e2e/modules/newsfeed_spec.js
@@ -26,7 +26,7 @@ describe("Newsfeed module", function () {
 	});
 
 	describe("Default configuration", function () {
-		before(function () {
+		beforeAll(function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/newsfeed/default.js";
 		});
 
@@ -46,7 +46,7 @@ describe("Newsfeed module", function () {
 	});
 
 	describe("Custom configuration", function () {
-		before(function () {
+		beforeAll(function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/newsfeed/prohibited_words.js";
 		});
 
@@ -62,7 +62,7 @@ describe("Newsfeed module", function () {
 	});
 
 	describe("Invalid configuration", function () {
-		before(function () {
+		beforeAll(function () {
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/newsfeed/incorrect_url.js";
 		});
 
diff --git a/tests/e2e/modules/weather_spec.js b/tests/e2e/modules/weather_spec.js
index 70c88512..dfba259d 100644
--- a/tests/e2e/modules/weather_spec.js
+++ b/tests/e2e/modules/weather_spec.js
@@ -42,12 +42,12 @@ describe("Weather module", function () {
 	describe("Current weather", function () {
 		let template;
 
-		before(function () {
+		beforeAll(function () {
 			template = fs.readFileSync(path.join(__dirname, "..", "..", "..", "modules", "default", "weather", "current.njk"), "utf8");
 		});
 
 		describe("Default configuration", function () {
-			before(function () {
+			beforeAll(function () {
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/currentweather_default.js";
 			});
 
@@ -94,7 +94,7 @@ describe("Weather module", function () {
 		});
 
 		describe("Compliments Integration", function () {
-			before(function () {
+			beforeAll(function () {
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/currentweather_compliments.js";
 			});
 
@@ -107,7 +107,7 @@ describe("Weather module", function () {
 		});
 
 		describe("Configuration Options", function () {
-			before(function () {
+			beforeAll(function () {
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/currentweather_options.js";
 			});
 
@@ -144,7 +144,7 @@ describe("Weather module", function () {
 		});
 
 		describe("Current weather units", function () {
-			before(function () {
+			beforeAll(function () {
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/currentweather_units.js";
 			});
 
@@ -185,12 +185,12 @@ describe("Weather module", function () {
 	describe("Weather Forecast", function () {
 		let template;
 
-		before(function () {
+		beforeAll(function () {
 			template = fs.readFileSync(path.join(__dirname, "..", "..", "..", "modules", "default", "weather", "forecast.njk"), "utf8");
 		});
 
 		describe("Default configuration", function () {
-			before(function () {
+			beforeAll(function () {
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_default.js";
 			});
 
@@ -254,7 +254,7 @@ describe("Weather module", function () {
 		});
 
 		describe("Configuration Options", function () {
-			before(function () {
+			beforeAll(function () {
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_options.js";
 			});
 
@@ -276,7 +276,7 @@ describe("Weather module", function () {
 		});
 
 		describe("Forecast weather units", function () {
-			before(function () {
+			beforeAll(function () {
 				process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_units.js";
 			});
 
diff --git a/tests/e2e/modules_display_spec.js b/tests/e2e/modules_display_spec.js
index 5ae06b6f..bea5889a 100644
--- a/tests/e2e/modules_display_spec.js
+++ b/tests/e2e/modules_display_spec.js
@@ -23,7 +23,7 @@ describe("Display of modules", function () {
 	});
 
 	describe("Using helloworld", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/display.js";
 		});
diff --git a/tests/e2e/modules_position_spec.js b/tests/e2e/modules_position_spec.js
index 7e8662be..6378bf2d 100644
--- a/tests/e2e/modules_position_spec.js
+++ b/tests/e2e/modules_position_spec.js
@@ -9,11 +9,11 @@ describe("Position of modules", function () {
 	let app = null;
 
 	describe("Using helloworld", function () {
-		after(function () {
+		afterAll(function () {
 			return helpers.stopApplication(app);
 		});
 
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in test
 			process.env.MM_CONFIG_FILE = "tests/configs/modules/positions.js";
 			return helpers
diff --git a/tests/e2e/port_config.js b/tests/e2e/port_config.js
index e32f577b..da255cd7 100644
--- a/tests/e2e/port_config.js
+++ b/tests/e2e/port_config.js
@@ -27,7 +27,7 @@ describe("port directive configuration", function () {
 	});
 
 	describe("Set port 8090", function () {
-		before(function () {
+		beforeAll(function () {
 			// Set config sample for use in this test
 			process.env.MM_CONFIG_FILE = "tests/configs/port_8090.js";
 		});
@@ -41,13 +41,13 @@ describe("port directive configuration", function () {
 	});
 
 	describe("Set port 8100 on environment variable MM_PORT", function () {
-		before(function () {
+		beforeAll(function () {
 			process.env.MM_PORT = 8100;
 			// Set config sample for use in this test
 			process.env.MM_CONFIG_FILE = "tests/configs/port_8090.js";
 		});
 
-		after(function () {
+		afterAll(function () {
 			delete process.env.MM_PORT;
 		});
 
diff --git a/tests/e2e/translations_spec.js b/tests/e2e/translations_spec.js
index 5f0d6053..f19d8a6e 100644
--- a/tests/e2e/translations_spec.js
+++ b/tests/e2e/translations_spec.js
@@ -12,7 +12,7 @@ const sinon = require("sinon");
 describe("Translations", function () {
 	let server;
 
-	before(function () {
+	beforeAll(function () {
 		const app = express();
 		app.use(helmet());
 		app.use(function (req, res, next) {
@@ -24,7 +24,7 @@ describe("Translations", function () {
 		server = app.listen(3000);
 	});
 
-	after(function () {
+	afterAll(function () {
 		server.close();
 	});
 
@@ -157,7 +157,7 @@ describe("Translations", function () {
 	describe("Same keys", function () {
 		let base;
 
-		before(function (done) {
+		beforeAll(function (done) {
 			const dom = new JSDOM(
 				`<script>var translations = ${JSON.stringify(translations)}; var Log = {log: function(){}};</script>\
 					<script src="file://${path.join(__dirname, "..", "..", "js", "translator.js")}">`,
@@ -181,7 +181,7 @@ describe("Translations", function () {
 			describe(`Translation keys of ${language}`, function () {
 				let keys;
 
-				before(function (done) {
+				beforeAll(function (done) {
 					const dom = new JSDOM(
 						`<script>var translations = ${JSON.stringify(translations)}; var Log = {log: function(){}};</script>\
 					<script src="file://${path.join(__dirname, "..", "..", "js", "translator.js")}">`,
diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js
index 49499756..b12193ad 100644
--- a/tests/e2e/vendor_spec.js
+++ b/tests/e2e/vendor_spec.js
@@ -12,7 +12,7 @@ describe("Vendors", function () {
 
 	let app = null;
 
-	before(function () {
+	beforeAll(function () {
 		process.env.MM_CONFIG_FILE = "tests/configs/env.js";
 		return helpers
 			.startApplication({
@@ -23,7 +23,7 @@ describe("Vendors", function () {
 			});
 	});
 
-	after(function () {
+	afterAll(function () {
 		return helpers.stopApplication(app);
 	});
 
diff --git a/tests/e2e/without_modules.js b/tests/e2e/without_modules.js
index 637236ba..7c2e0f5b 100644
--- a/tests/e2e/without_modules.js
+++ b/tests/e2e/without_modules.js
@@ -24,7 +24,7 @@ describe("Check configuration without modules", function () {
 		return helpers.stopApplication(app);
 	});
 
-	before(function () {
+	beforeAll(function () {
 		// Set config sample for use in test
 		process.env.MM_CONFIG_FILE = "tests/configs/without_modules.js";
 	});

From 0e14d3d6e8b024cda1a1e2a181c2af6931897eda Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Wed, 9 Jun 2021 00:19:43 +0200
Subject: [PATCH 04/22] snapshot e2e

---
 package.json                                  |  1 +
 tests/e2e/dev_console.js                      |  7 ++-
 tests/e2e/fonts.js                            |  6 +--
 tests/e2e/global-setup.js                     |  8 ----
 ...pWhistlist_spec.js => ipWhitelist_spec.js} |  5 +-
 tests/e2e/modules/calendar_spec.js            | 15 +++---
 tests/e2e/modules/clock_es_spec.js            | 12 ++---
 tests/e2e/modules/clock_spec.js               | 19 ++++----
 tests/e2e/modules/compliments_spec.js         | 13 +++---
 tests/e2e/modules/helloworld_spec.js          |  4 +-
 tests/e2e/modules/newsfeed_spec.js            |  5 +-
 tests/e2e/modules/weather_spec.js             |  9 ++--
 tests/e2e/modules_display_spec.js             |  4 +-
 tests/e2e/modules_position_spec.js            |  2 +-
 tests/e2e/port_config.js                      |  5 +-
 tests/e2e/translations_spec.js                | 46 +++++++++----------
 tests/e2e/vendor_spec.js                      |  5 +-
 tests/e2e/without_modules.js                  |  4 +-
 tests/unit/classes/class_spec.js              | 39 ++++++++--------
 19 files changed, 93 insertions(+), 116 deletions(-)
 rename tests/e2e/{ipWhistlist_spec.js => ipWhitelist_spec.js} (91%)

diff --git a/package.json b/package.json
index 0f1fd8f1..a59987a3 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
 			"node_helper": "<rootDir>/js/node_helper.js",
 			// "logger": "<rootDir>/js/logger.js", <-- only for unit tests, not for e2e
 			// replace require("chai").expect with expect from jest, see e2e/env_spec.js
+			// https://medium.com/swlh/6-ways-to-run-jest-test-cases-silently-67d2fead8c11
 			"moment-timezone": "<rootDir>/node_modules/moment-timezone/moment-timezone.js",
 			"moment": "<rootDir>/node_modules/moment/moment.js"
 		}
diff --git a/tests/e2e/dev_console.js b/tests/e2e/dev_console.js
index fe5b5976..3397ec98 100644
--- a/tests/e2e/dev_console.js
+++ b/tests/e2e/dev_console.js
@@ -1,5 +1,4 @@
 const helpers = require("./global-setup");
-const expect = require("chai").expect;
 
 const describe = global.describe;
 const it = global.it;
@@ -31,7 +30,7 @@ describe("Development console tests", function () {
 
 		it("should not open dev console when absent", async function () {
 			await app.client.waitUntilWindowLoaded();
-			return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(false);
+			return expect(await app.browserWindow.isDevToolsOpened()).toBe(false);
 		});
 	});
 
@@ -51,9 +50,9 @@ describe("Development console tests", function () {
 	// 	});
 
 	// 	it("should open dev console when provided", async function () {
-	// 		expect(await app.client.getWindowCount()).to.equal(2);
+	// 		expect(await app.client.getWindowCount()).toBe(2);
 	// 		await app.client.waitUntilWindowLoaded();
-	// 		return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(true);
+	// 		return expect(await app.browserWindow.isDevToolsOpened()).toBe(true);
 	// 	});
 	// });
 });
diff --git a/tests/e2e/fonts.js b/tests/e2e/fonts.js
index 8848cfcb..ab4f67b8 100644
--- a/tests/e2e/fonts.js
+++ b/tests/e2e/fonts.js
@@ -1,7 +1,5 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
-const expect = require("chai").expect;
-const forEach = require("mocha-each");
 
 const describe = global.describe;
 
@@ -38,10 +36,10 @@ describe("All font files from roboto.css should be downloadable", function () {
 		return helpers.stopApplication(app);
 	});
 
-	forEach(fontFiles).it("should return 200 HTTP code for file '%s'", (fontFile, done) => {
+	test.each(fontFiles)("should return 200 HTTP code for file '%s'", (fontFile, done) => {
 		const fontUrl = "http://localhost:8080/fonts/" + fontFile;
 		fetch(fontUrl).then((res) => {
-			expect(res.status).to.equal(200);
+			expect(res.status).toBe(200);
 			done();
 		});
 	});
diff --git a/tests/e2e/global-setup.js b/tests/e2e/global-setup.js
index 0f5ad57e..0451c3bd 100644
--- a/tests/e2e/global-setup.js
+++ b/tests/e2e/global-setup.js
@@ -6,15 +6,8 @@
  */
 const Application = require("spectron").Application;
 const assert = require("assert");
-const chai = require("chai");
-const chaiAsPromised = require("chai-as-promised");
 const path = require("path");
 
-global.beforeAll(function () {
-	chai.should();
-	chai.use(chaiAsPromised);
-});
-
 exports.getElectronPath = function () {
 	let electronPath = path.join(__dirname, "..", "..", "node_modules", ".bin", "electron");
 	if (process.platform === "win32") {
@@ -41,7 +34,6 @@ exports.startApplication = function (options) {
 	const app = new Application(options);
 	return app.start().then(function () {
 		assert.strictEqual(app.isRunning(), true);
-		chaiAsPromised.transferPromiseness = app.transferPromiseness;
 		return app;
 	});
 };
diff --git a/tests/e2e/ipWhistlist_spec.js b/tests/e2e/ipWhitelist_spec.js
similarity index 91%
rename from tests/e2e/ipWhistlist_spec.js
rename to tests/e2e/ipWhitelist_spec.js
index 64d7ebe6..37ae2022 100644
--- a/tests/e2e/ipWhistlist_spec.js
+++ b/tests/e2e/ipWhitelist_spec.js
@@ -1,6 +1,5 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
-const expect = require("chai").expect;
 
 const describe = global.describe;
 const it = global.it;
@@ -34,7 +33,7 @@ describe("ipWhitelist directive configuration", function () {
 
 		it("should return 403", function (done) {
 			fetch("http://localhost:8080").then((res) => {
-				expect(res.status).to.equal(403);
+				expect(res.status).toBe(403);
 				done();
 			});
 		});
@@ -48,7 +47,7 @@ describe("ipWhitelist directive configuration", function () {
 
 		it("should return 200", function (done) {
 			fetch("http://localhost:8080").then((res) => {
-				expect(res.status).to.equal(200);
+				expect(res.status).toBe(200);
 				done();
 			});
 		});
diff --git a/tests/e2e/modules/calendar_spec.js b/tests/e2e/modules/calendar_spec.js
index d2c2ece9..197b927e 100644
--- a/tests/e2e/modules/calendar_spec.js
+++ b/tests/e2e/modules/calendar_spec.js
@@ -1,6 +1,5 @@
 const helpers = require("../global-setup");
 const serverBasicAuth = require("../../servers/basic-auth.js");
-const expect = require("chai").expect;
 
 const describe = global.describe;
 const it = global.it;
@@ -35,13 +34,13 @@ describe("Calendar module", function () {
 		it("should show the default maximumEntries of 10", async () => {
 			await app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 			const events = await app.client.$$(".calendar .event");
-			return expect(events.length).equals(10);
+			return expect(events.length).toBe(10);
 		});
 
 		it("should show the default calendar symbol in each event", async () => {
 			await app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 			const icons = await app.client.$$(".calendar .event .fa-calendar");
-			return expect(icons.length).not.equals(0);
+			return expect(icons.length).not.toBe(0);
 		});
 	});
 
@@ -54,25 +53,25 @@ describe("Calendar module", function () {
 		it("should show the custom maximumEntries of 4", async () => {
 			await app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 			const events = await app.client.$$(".calendar .event");
-			return expect(events.length).equals(4);
+			return expect(events.length).toBe(4);
 		});
 
 		it("should show the custom calendar symbol in each event", async () => {
 			await app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
 			const icons = await app.client.$$(".calendar .event .fa-birthday-cake");
-			return expect(icons.length).equals(4);
+			return expect(icons.length).toBe(4);
 		});
 
 		it("should show two custom icons for repeating events", async () => {
 			await app.client.waitUntilTextExists(".calendar", "TestEventRepeat", 10000);
 			const icons = await app.client.$$(".calendar .event .fa-undo");
-			return expect(icons.length).equals(2);
+			return expect(icons.length).toBe(2);
 		});
 
 		it("should show two custom icons for day events", async () => {
 			await app.client.waitUntilTextExists(".calendar", "TestEventDay", 10000);
 			const icons = await app.client.$$(".calendar .event .fa-calendar-day");
-			return expect(icons.length).equals(2);
+			return expect(icons.length).toBe(2);
 		});
 	});
 
@@ -85,7 +84,7 @@ describe("Calendar module", function () {
 		it("should show the recurring birthday event 6 times", async () => {
 			await app.client.waitUntilTextExists(".calendar", "Mar 25th", 10000);
 			const events = await app.client.$$(".calendar .event");
-			return expect(events.length).equals(6);
+			return expect(events.length).toBe(6);
 		});
 	});
 
diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index a2622fb6..b7537e09 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -33,13 +33,13 @@ describe("Clock set to spanish language module", function () {
 		it("shows date with correct format", async function () {
 			const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
 			const elem = await app.client.$(".clock .date");
-			return elem.getText(".clock .date").should.eventually.match(dateRegex);
+			return elem.getText(".clock .date").toString().match(dateRegex);
 		});
 
 		it("shows time in 24hr format", async function () {
 			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
 			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").should.eventually.match(timeRegex);
+			return elem.getText(".clock .time").toString().match(timeRegex);
 		});
 	});
 
@@ -52,13 +52,13 @@ describe("Clock set to spanish language module", function () {
 		it("shows date with correct format", async function () {
 			const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
 			const elem = await app.client.$(".clock .date");
-			return elem.getText(".clock .date").should.eventually.match(dateRegex);
+			return elem.getText(".clock .date").toString().match(dateRegex);
 		});
 
 		it("shows time in 12hr format", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
 			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").should.eventually.match(timeRegex);
+			return elem.getText(".clock .time").toString().match(timeRegex);
 		});
 	});
 
@@ -71,7 +71,7 @@ describe("Clock set to spanish language module", function () {
 		it("shows 12hr time with upper case AM/PM", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
 			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").should.eventually.match(timeRegex);
+			return elem.getText(".clock .time").toString().match(timeRegex);
 		});
 	});
 
@@ -84,7 +84,7 @@ describe("Clock set to spanish language module", function () {
 		it("shows week with correct format", async function () {
 			const weekRegex = /^Semana [0-9]{1,2}$/;
 			const elem = await app.client.$(".clock .week");
-			elem.getText(".clock .week").should.eventually.match(weekRegex);
+			elem.getText(".clock .week").toString().match(weekRegex);
 		});
 	});
 });
diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js
index ff614cf7..e5e0f0b7 100644
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -1,5 +1,4 @@
 const helpers = require("../global-setup");
-const expect = require("chai").expect;
 const moment = require("moment");
 
 const describe = global.describe;
@@ -35,13 +34,13 @@ describe("Clock module", function () {
 		it("should show the date in the correct format", async function () {
 			const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
 			const elem = await app.client.$(".clock .date");
-			return elem.getText(".clock .date").should.eventually.match(dateRegex);
+			return elem.getText(".clock .date").toString().match(dateRegex);
 		});
 
 		it("should show the time in 24hr format", async function () {
 			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
 			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").should.eventually.match(timeRegex);
+			return elem.getText(".clock .time").toString().match(timeRegex);
 		});
 	});
 
@@ -54,13 +53,13 @@ describe("Clock module", function () {
 		it("should show the date in the correct format", async function () {
 			const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
 			const elem = await app.client.$(".clock .date");
-			return elem.getText(".clock .date").should.eventually.match(dateRegex);
+			return elem.getText(".clock .date").toString().match(dateRegex);
 		});
 
 		it("should show the time in 12hr format", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
 			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").should.eventually.match(timeRegex);
+			return elem.getText(".clock .time").toString().match(timeRegex);
 		});
 	});
 
@@ -73,7 +72,7 @@ describe("Clock module", function () {
 		it("should show 12hr time with upper case AM/PM", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
 			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").should.eventually.match(timeRegex);
+			return elem.getText(".clock .time").toString().match(timeRegex);
 		});
 	});
 
@@ -86,7 +85,7 @@ describe("Clock module", function () {
 		it("should show 12hr time without seconds am/pm", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[ap]m$/;
 			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").should.eventually.match(timeRegex);
+			return elem.getText(".clock .time").toString().match(timeRegex);
 		});
 	});
 
@@ -99,14 +98,14 @@ describe("Clock module", function () {
 		it("should show the week in the correct format", async function () {
 			const weekRegex = /^Week [0-9]{1,2}$/;
 			const elem = await app.client.$(".clock .week");
-			return elem.getText(".clock .week").should.eventually.match(weekRegex);
+			return elem.getText(".clock .week").toString().match(weekRegex);
 		});
 
 		it("should show the week with the correct number of week of year", async function () {
 			const currentWeekNumber = moment().week();
 			const weekToShow = "Week " + currentWeekNumber;
 			const elem = await app.client.$(".clock .week");
-			return elem.getText(".clock .week").should.eventually.equal(weekToShow);
+			return (elem.getText(".clock .week") === weekToShow);
 		});
 	});
 
@@ -119,7 +118,7 @@ describe("Clock module", function () {
 		it("should show the analog clock face", async () => {
 			await app.client.waitUntilWindowLoaded(10000);
 			const clock = await app.client.$$(".clockCircle");
-			return expect(clock.length).equals(1);
+			return expect(clock.length).toBe(1);
 		});
 	});
 });
diff --git a/tests/e2e/modules/compliments_spec.js b/tests/e2e/modules/compliments_spec.js
index 067bab1c..15fc3445 100644
--- a/tests/e2e/modules/compliments_spec.js
+++ b/tests/e2e/modules/compliments_spec.js
@@ -1,5 +1,4 @@
 const helpers = require("../global-setup");
-const expect = require("chai").expect;
 
 const describe = global.describe;
 const it = global.it;
@@ -37,7 +36,7 @@ describe("Compliments module", function () {
 				// if morning check
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(text).to.be.oneOf(["Hi", "Good Morning", "Morning test"]);
+					expect(["Hi", "Good Morning", "Morning test"]).toContain(text) 
 				});
 			}
 		});
@@ -48,7 +47,7 @@ describe("Compliments module", function () {
 				// if afternoon check
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(text).to.be.oneOf(["Hello", "Good Afternoon", "Afternoon test"]);
+					expect(["Hello", "Good Afternoon", "Afternoon test"]).toContain(text) 
 				});
 			}
 		});
@@ -59,7 +58,7 @@ describe("Compliments module", function () {
 				// if evening check
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(text).to.be.oneOf(["Hello There", "Good Evening", "Evening test"]);
+					expect(["Hello There", "Good Evening", "Evening test"]).toContain(text) 
 				});
 			}
 		});
@@ -75,7 +74,7 @@ describe("Compliments module", function () {
 			it("Show anytime because if configure empty parts of day compliments and set anytime compliments", async function () {
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(text).to.be.oneOf(["Anytime here"]);
+					expect(["Anytime here"]).toContain(text) 
 				});
 			});
 		});
@@ -89,7 +88,7 @@ describe("Compliments module", function () {
 			it("Show anytime compliments", async function () {
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(text).to.be.oneOf(["Anytime here"]);
+					expect(["Anytime here"]).toContain(text) 
 				});
 			});
 		});
@@ -105,7 +104,7 @@ describe("Compliments module", function () {
 			it("Show happy new year compliment on new years day", async function () {
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(text).to.be.oneOf(["Happy new year!"]);
+					expect(["Happy new year!"]).toContain(text) 
 				});
 			});
 		});
diff --git a/tests/e2e/modules/helloworld_spec.js b/tests/e2e/modules/helloworld_spec.js
index a1ea7c44..e9fd166c 100644
--- a/tests/e2e/modules/helloworld_spec.js
+++ b/tests/e2e/modules/helloworld_spec.js
@@ -32,7 +32,7 @@ describe("Test helloworld module", function () {
 
 		it("Test message helloworld module", async function () {
 			const elem = await app.client.$("helloworld");
-			return elem.getText(".helloworld").should.eventually.equal("Test HelloWorld Module");
+			return (elem.getText(".helloworld") === "Test HelloWorld Module");
 		});
 	});
 
@@ -44,7 +44,7 @@ describe("Test helloworld module", function () {
 
 		it("Test message helloworld module", async function () {
 			const elem = await app.client.$("helloworld");
-			return elem.getText(".helloworld").should.eventually.equal("Hello World!");
+			return (elem.getText(".helloworld") === "Hello World!");
 		});
 	});
 });
diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js
index 7ca67a99..91a3bf42 100644
--- a/tests/e2e/modules/newsfeed_spec.js
+++ b/tests/e2e/modules/newsfeed_spec.js
@@ -1,5 +1,4 @@
 const helpers = require("../global-setup");
-const expect = require("chai").expect;
 
 const describe = global.describe;
 const it = global.it;
@@ -41,7 +40,7 @@ describe("Newsfeed module", function () {
 		it("should NOT show the newsfeed description", async () => {
 			await app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "QPanel", 10000);
 			const events = await app.client.$$(".newsfeed .newsfeed-desc");
-			return expect(events.length).equals(0);
+			return expect(events.length).toBe(0);
 		});
 	});
 
@@ -57,7 +56,7 @@ describe("Newsfeed module", function () {
 		it("should show the newsfeed description", async () => {
 			await app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "Problema VirtualBox", 10000);
 			const events = await app.client.$$(".newsfeed .newsfeed-desc");
-			return expect(events.length).equals(1);
+			return expect(events.length).toBe(1);
 		});
 	});
 
diff --git a/tests/e2e/modules/weather_spec.js b/tests/e2e/modules/weather_spec.js
index dfba259d..5698dc6a 100644
--- a/tests/e2e/modules/weather_spec.js
+++ b/tests/e2e/modules/weather_spec.js
@@ -1,4 +1,3 @@
-const expect = require("chai").expect;
 const fs = require("fs");
 const moment = require("moment");
 const path = require("path");
@@ -31,7 +30,7 @@ describe("Weather module", function () {
 	async function getText(element, result) {
 		const elem = await getElement(element);
 		return await elem.getText(element).then(function (text) {
-			expect(text.trim()).to.equal(result);
+			expect(text.trim()).toBe(result);
 		});
 	}
 
@@ -124,7 +123,7 @@ describe("Weather module", function () {
 
 				const elem = await getElement(".weather .normal.medium sup i.fa-long-arrow-up");
 				return elem.getHTML(".weather .normal.medium sup i.fa-long-arrow-up").then(function (text) {
-					expect(text).to.include("transform:rotate(250deg);");
+					expect(text).toContain("transform:rotate(250deg);");
 				});
 			});
 
@@ -248,7 +247,7 @@ describe("Weather module", function () {
 
 				for (const [index, opacity] of opacities.entries()) {
 					const html = await elem.getHTML(`.weather table.small tr:nth-child(${index + 1})`);
-					expect(html).to.includes(`<tr style="opacity: ${opacity};">`);
+					expect(html).toContain(`<tr style="opacity: ${opacity};">`);
 				}
 			});
 		});
@@ -271,7 +270,7 @@ describe("Weather module", function () {
 
 				const rows = await app.client.$$(".weather table.myTableClass tr.colored");
 
-				expect(rows.length).to.be.equal(5);
+				expect(rows.length).toBe(5);
 			});
 		});
 
diff --git a/tests/e2e/modules_display_spec.js b/tests/e2e/modules_display_spec.js
index bea5889a..64f75d2e 100644
--- a/tests/e2e/modules_display_spec.js
+++ b/tests/e2e/modules_display_spec.js
@@ -30,12 +30,12 @@ describe("Display of modules", function () {
 
 		it("should show the test header", async () => {
 			const elem = await app.client.$("#module_0_helloworld .module-header", 10000);
-			return elem.getText("#module_0_helloworld .module-header").should.eventually.equal("TEST_HEADER");
+			return (elem.getText("#module_0_helloworld .module-header") === "TEST_HEADER");
 		});
 
 		it("should show no header if no header text is specified", async () => {
 			const elem = await app.client.$("#module_1_helloworld .module-header", 10000);
-			return elem.getText("#module_1_helloworld .module-header").should.eventually.equal(false);
+			return (elem.getText("#module_1_helloworld .module-header") === false);
 		});
 	});
 });
diff --git a/tests/e2e/modules_position_spec.js b/tests/e2e/modules_position_spec.js
index 6378bf2d..aac010a7 100644
--- a/tests/e2e/modules_position_spec.js
+++ b/tests/e2e/modules_position_spec.js
@@ -31,7 +31,7 @@ describe("Position of modules", function () {
 			const className = position.replace("_", ".");
 			it("should show text in " + position, function () {
 				return app.client.$("." + className).then((result) => {
-					return result.getText("." + className).should.eventually.equal("Text in " + position);
+					return (result.getText("." + className) === "Text in " + position);
 				});
 			});
 		}
diff --git a/tests/e2e/port_config.js b/tests/e2e/port_config.js
index da255cd7..46ebfb23 100644
--- a/tests/e2e/port_config.js
+++ b/tests/e2e/port_config.js
@@ -1,6 +1,5 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
-const expect = require("chai").expect;
 
 const describe = global.describe;
 const it = global.it;
@@ -34,7 +33,7 @@ describe("port directive configuration", function () {
 
 		it("should return 200", function (done) {
 			fetch("http://localhost:8090").then((res) => {
-				expect(res.status).to.equal(200);
+				expect(res.status).toBe(200);
 				done();
 			});
 		});
@@ -53,7 +52,7 @@ describe("port directive configuration", function () {
 
 		it("should return 200", function (done) {
 			fetch("http://localhost:8100").then((res) => {
-				expect(res.status).to.equal(200);
+				expect(res.status).toBe(200);
 				done();
 			});
 		});
diff --git a/tests/e2e/translations_spec.js b/tests/e2e/translations_spec.js
index f19d8a6e..ddf42d84 100644
--- a/tests/e2e/translations_spec.js
+++ b/tests/e2e/translations_spec.js
@@ -1,8 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const chai = require("chai");
-const expect = chai.expect;
-const mlog = require("mocha-logger");
 const translations = require("../../translations/translations.js");
 const helmet = require("helmet");
 const { JSDOM } = require("jsdom");
@@ -31,7 +28,7 @@ describe("Translations", function () {
 	it("should have a translation file in the specified path", function () {
 		for (let language in translations) {
 			const file = fs.statSync(translations[language]);
-			expect(file.isFile()).to.be.equal(true);
+			expect(file.isFile()).toBe(true);
 		}
 	});
 
@@ -59,9 +56,9 @@ describe("Translations", function () {
 				const loaded = sinon.stub();
 				MMM.loadTranslations(loaded);
 
-				expect(loaded.callCount).to.equal(1);
-				expect(Translator.load.args.length).to.equal(1);
-				expect(Translator.load.calledWith(MMM, "translations/en.json", false, sinon.match.func)).to.be.true;
+				expect(loaded.callCount).toBe(1);
+				expect(Translator.load.args.length).toBe(1);
+				expect(Translator.load.calledWith(MMM, "translations/en.json", false, sinon.match.func)).toBe(true);
 
 				done();
 			};
@@ -78,10 +75,10 @@ describe("Translations", function () {
 				const loaded = sinon.stub();
 				MMM.loadTranslations(loaded);
 
-				expect(loaded.callCount).to.equal(1);
-				expect(Translator.load.args.length).to.equal(2);
-				expect(Translator.load.calledWith(MMM, "translations/de.json", false, sinon.match.func)).to.be.true;
-				expect(Translator.load.calledWith(MMM, "translations/en.json", true, sinon.match.func)).to.be.true;
+				expect(loaded.callCount).toBe(1);
+				expect(Translator.load.args.length).toBe(2);
+				expect(Translator.load.calledWith(MMM, "translations/de.json", false, sinon.match.func)).toBe(true);
+				expect(Translator.load.calledWith(MMM, "translations/en.json", true, sinon.match.func)).toBe(true);
 
 				done();
 			};
@@ -99,9 +96,9 @@ describe("Translations", function () {
 				const loaded = sinon.stub();
 				MMM.loadTranslations(loaded);
 
-				expect(loaded.callCount).to.equal(1);
-				expect(Translator.load.args.length).to.equal(1);
-				expect(Translator.load.calledWith(MMM, "translations/en.json", true, sinon.match.func)).to.be.true;
+				expect(loaded.callCount).toBe(1);
+				expect(Translator.load.args.length).toBe(1);
+				expect(Translator.load.calledWith(MMM, "translations/en.json", true, sinon.match.func)).toBe(true);
 
 				done();
 			};
@@ -118,8 +115,8 @@ describe("Translations", function () {
 				const loaded = sinon.stub();
 				MMM.loadTranslations(loaded);
 
-				expect(loaded.callCount).to.equal(1);
-				expect(Translator.load.callCount).to.equal(0);
+				expect(loaded.callCount).toBe(1);
+				expect(Translator.load.callCount).toBe(0);
 
 				done();
 			};
@@ -145,8 +142,8 @@ describe("Translations", function () {
 					const { Translator } = dom.window;
 
 					Translator.load(mmm, translations[language], false, function () {
-						expect(Translator.translations[mmm.name]).to.be.an("object");
-						expect(Object.keys(Translator.translations[mmm.name]).length).to.be.at.least(1);
+						expect(typeof Translator.translations[mmm.name]).toBe("object");
+						expect(Object.keys(Translator.translations[mmm.name]).length).toBeGreaterThanOrEqual(1);
 						done();
 					});
 				};
@@ -199,22 +196,21 @@ describe("Translations", function () {
 
 				it(`${language} keys should be in base`, function () {
 					keys.forEach(function (key) {
-						expect(base.indexOf(key)).to.be.at.least(0);
+						expect(base.indexOf(key)).toBeGreaterThanOrEqual(0);
 					});
 				});
 
 				it(`${language} should contain all base keys`, function () {
 					// TODO: when all translations are fixed, use
-					// expect(keys).to.deep.equal(base);
+					// expect(keys).toEqual(base);
 					// instead of the try-catch-block
 
 					try {
-						expect(keys).to.deep.equal(base);
+						expect(keys).toEqual(base);
 					} catch (e) {
-						if (e instanceof chai.AssertionError) {
-							const diff = base.filter((key) => !keys.includes(key));
-							mlog.pending(`Missing Translations for language ${language}: ${diff}`);
-							this.skip();
+						if (e.message.match(/expect.*toEqual/)) {
+							// const diff = base.filter((key) => !keys.includes(key));
+							// console.log(`Missing Translations for language ${language}: ${diff}`);
 						} else {
 							throw e;
 						}
diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js
index b12193ad..fe0077b6 100644
--- a/tests/e2e/vendor_spec.js
+++ b/tests/e2e/vendor_spec.js
@@ -1,6 +1,5 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
-const expect = require("chai").expect;
 
 const describe = global.describe;
 const it = global.it;
@@ -33,7 +32,7 @@ describe("Vendors", function () {
 			it(`should return 200 HTTP code for vendor "${vendor}"`, function () {
 				const urlVendor = "http://localhost:8080/vendor/" + vendors[vendor];
 				fetch(urlVendor).then((res) => {
-					expect(res.status).to.equal(200);
+					expect(res.status).toBe(200);
 				});
 			});
 		});
@@ -42,7 +41,7 @@ describe("Vendors", function () {
 			it(`should return 404 HTTP code for vendor https://localhost/"${vendor}"`, function () {
 				const urlVendor = "http://localhost:8080/" + vendors[vendor];
 				fetch(urlVendor).then((res) => {
-					expect(res.status).to.equal(404);
+					expect(res.status).toBe(404);
 				});
 			});
 		});
diff --git a/tests/e2e/without_modules.js b/tests/e2e/without_modules.js
index 7c2e0f5b..1b14f967 100644
--- a/tests/e2e/without_modules.js
+++ b/tests/e2e/without_modules.js
@@ -31,11 +31,11 @@ describe("Check configuration without modules", function () {
 
 	it("Show the message MagicMirror title", async function () {
 		const elem = await app.client.$("#module_1_helloworld .module-content");
-		return elem.getText("#module_1_helloworld .module-content").should.eventually.equal("Magic Mirror2");
+		return (elem.getText("#module_1_helloworld .module-content") === "Magic Mirror2");
 	});
 
 	it("Show the text Michael's website", async function () {
 		const elem = await app.client.$("#module_5_helloworld .module-content");
-		return elem.getText("#module_5_helloworld .module-content").should.eventually.equal("www.michaelteeuw.nl");
+		return (elem.getText("#module_5_helloworld .module-content") === "www.michaelteeuw.nl");
 	});
 });
diff --git a/tests/unit/classes/class_spec.js b/tests/unit/classes/class_spec.js
index f7f41143..186e5ddf 100644
--- a/tests/unit/classes/class_spec.js
+++ b/tests/unit/classes/class_spec.js
@@ -1,4 +1,3 @@
-const expect = require("chai").expect;
 const path = require("path");
 const { JSDOM } = require("jsdom");
 
@@ -23,43 +22,43 @@ describe("File js/class", function () {
 		it("should clone object", function () {
 			const expected = { name: "Rodrigo", web: "https://rodrigoramirez.com", project: "MagicMirror" };
 			const obj = clone(expected);
-			expect(obj).to.deep.equal(expected);
-			expect(expected === obj).to.equal(false);
+			expect(obj).toEqual(expected);
+			expect(expected === obj).toBe(false);
 		});
 
 		it("should clone array", function () {
 			const expected = [1, null, undefined, "TEST"];
 			const obj = clone(expected);
-			expect(obj).to.deep.equal(expected);
-			expect(expected === obj).to.equal(false);
+			expect(obj).toEqual(expected);
+			expect(expected === obj).toBe(false);
 		});
 
 		it("should clone number", function () {
 			let expected = 1;
 			let obj = clone(expected);
-			expect(obj).to.equal(expected);
+			expect(obj).toBe(expected);
 
 			expected = 1.23;
 			obj = clone(expected);
-			expect(obj).to.equal(expected);
+			expect(obj).toBe(expected);
 		});
 
 		it("should clone string", function () {
 			const expected = "Perfect stranger";
 			const obj = clone(expected);
-			expect(obj).to.equal(expected);
+			expect(obj).toBe(expected);
 		});
 
 		it("should clone undefined", function () {
 			const expected = undefined;
 			const obj = clone(expected);
-			expect(obj).to.equal(expected);
+			expect(obj).toBe(expected);
 		});
 
 		it("should clone null", function () {
 			const expected = null;
 			const obj = clone(expected);
-			expect(obj).to.equal(expected);
+			expect(obj).toBe(expected);
 		});
 
 		it("should clone nested object", function () {
@@ -75,13 +74,13 @@ describe("File js/class", function () {
 				}
 			};
 			const obj = clone(expected);
-			expect(obj).to.deep.equal(expected);
-			expect(expected === obj).to.equal(false);
-			expect(expected.versions === obj.versions).to.equal(false);
-			expect(expected.properties === obj.properties).to.equal(false);
-			expect(expected.properties.items === obj.properties.items).to.equal(false);
-			expect(expected.properties.items[0] === obj.properties.items[0]).to.equal(false);
-			expect(expected.properties.items[1] === obj.properties.items[1]).to.equal(false);
+			expect(obj).toEqual(expected);
+			expect(expected === obj).toBe(false);
+			expect(expected.versions === obj.versions).toBe(false);
+			expect(expected.properties === obj.properties).toBe(false);
+			expect(expected.properties.items === obj.properties.items).toBe(false);
+			expect(expected.properties.items[0] === obj.properties.items[0]).toBe(false);
+			expect(expected.properties.items[1] === obj.properties.items[1]).toBe(false);
 		});
 
 		describe("Test lockstring code", function () {
@@ -90,7 +89,7 @@ describe("File js/class", function () {
 			beforeAll(function () {
 				log = dom.window.Log.log;
 				dom.window.Log.log = function cmp(str) {
-					expect(str).to.equal("lockStrings");
+					expect(str).toBe("lockStrings");
 				};
 			});
 
@@ -101,8 +100,8 @@ describe("File js/class", function () {
 			it("should clone object and log lockStrings", function () {
 				const expected = { name: "Module", lockStrings: "stringLock" };
 				const obj = clone(expected);
-				expect(obj).to.deep.equal(expected);
-				expect(expected === obj).to.equal(false);
+				expect(obj).toEqual(expected);
+				expect(expected === obj).toBe(false);
 			});
 		});
 	});

From ba4b976e804f390eaf155457670ec8ac80b1e871 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Thu, 10 Jun 2021 00:24:08 +0200
Subject: [PATCH 05/22] test config

---
 package.json | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index a59987a3..7e4f5bd1 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,10 @@
 		"install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error",
 		"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error",
 		"postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"",
-		"test": "NODE_ENV=test mocha tests --recursive",
-		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text mocha tests --recursive --timeout=3000",
-		"test:e2e": "NODE_ENV=test jest --testMatch **/tests/e2e/**/*",
-		"test:unit": "NODE_ENV=test jest --testMatch **/tests/unit/**/*",
+		"test": "NODE_ENV=test jest -i",
+		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i",
+		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i",
+		"test:unit": "NODE_ENV=test jest --selectProjects unit",
 		"test:prettier": "prettier . --check",
 		"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
 		"test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
@@ -91,13 +91,23 @@
 		"node": ">=12"
 	},
 	"jest": {
-		"moduleNameMapper": {
-			"node_helper": "<rootDir>/js/node_helper.js",
-			// "logger": "<rootDir>/js/logger.js", <-- only for unit tests, not for e2e
-			// replace require("chai").expect with expect from jest, see e2e/env_spec.js
-			// https://medium.com/swlh/6-ways-to-run-jest-test-cases-silently-67d2fead8c11
-			"moment-timezone": "<rootDir>/node_modules/moment-timezone/moment-timezone.js",
-			"moment": "<rootDir>/node_modules/moment/moment.js"
-		}
+		"verbose": true,
+		"projects": [
+			{
+				"displayName": "unit",
+				"testMatch": ["**/tests/unit/**/*.[jt]s?(x)"],
+				"moduleNameMapper": {
+					"node_helper": "<rootDir>/js/node_helper.js",
+					"logger": "<rootDir>/js/logger.js",
+					"moment-timezone": "<rootDir>/node_modules/moment-timezone/moment-timezone.js",
+					"moment": "<rootDir>/node_modules/moment/moment.js"
+				}
+			},
+			{
+				"displayName": "e2e",
+				"testMatch": ["**/tests/e2e/**/*.[jt]s?(x)"],
+				"testPathIgnorePatterns": ["<rootDir>/tests/e2e/modules/mocks", "<rootDir>/tests/e2e/global-setup.js"]
+			}
+		]
 	}
 }

From 65a8cb9ddb41968b75c170ef2f48617fd59e97bc Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Fri, 11 Jun 2021 00:32:54 +0200
Subject: [PATCH 06/22] remove unused references

---
 tests/e2e/dev_console.js              | 3 ---
 tests/e2e/env_spec.js                 | 8 ++++----
 tests/e2e/fonts.js                    | 2 +-
 tests/e2e/ipWhitelist_spec.js         | 5 -----
 tests/e2e/modules/alert_spec.js       | 8 ++++----
 tests/e2e/modules/calendar_spec.js    | 8 ++++----
 tests/e2e/modules/clock_es_spec.js    | 8 ++++----
 tests/e2e/modules/clock_spec.js       | 8 ++++----
 tests/e2e/modules/compliments_spec.js | 8 ++++----
 tests/e2e/modules/helloworld_spec.js  | 5 -----
 tests/e2e/modules/newsfeed_spec.js    | 8 ++++----
 tests/e2e/modules_display_spec.js     | 4 ++--
 tests/e2e/modules_position_spec.js    | 4 ++--
 tests/e2e/port_config.js              | 8 ++++----
 tests/e2e/vendor_spec.js              | 4 ++--
 tests/e2e/without_modules.js          | 8 ++++----
 16 files changed, 43 insertions(+), 56 deletions(-)

diff --git a/tests/e2e/dev_console.js b/tests/e2e/dev_console.js
index 3397ec98..26510ea4 100644
--- a/tests/e2e/dev_console.js
+++ b/tests/e2e/dev_console.js
@@ -1,8 +1,5 @@
 const helpers = require("./global-setup");
 
-const describe = global.describe;
-const it = global.it;
-
 describe("Development console tests", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/env_spec.js b/tests/e2e/env_spec.js
index 8d9da80d..d497f256 100644
--- a/tests/e2e/env_spec.js
+++ b/tests/e2e/env_spec.js
@@ -1,10 +1,10 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
+
+
+
+
 
 describe("Electron app environment", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/fonts.js b/tests/e2e/fonts.js
index ab4f67b8..60ef2ac4 100644
--- a/tests/e2e/fonts.js
+++ b/tests/e2e/fonts.js
@@ -1,7 +1,7 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
 
-const describe = global.describe;
+
 
 describe("All font files from roboto.css should be downloadable", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/ipWhitelist_spec.js b/tests/e2e/ipWhitelist_spec.js
index 37ae2022..3406e0e7 100644
--- a/tests/e2e/ipWhitelist_spec.js
+++ b/tests/e2e/ipWhitelist_spec.js
@@ -1,11 +1,6 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
-
 describe("ipWhitelist directive configuration", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/modules/alert_spec.js b/tests/e2e/modules/alert_spec.js
index 90322d26..8a5e07be 100644
--- a/tests/e2e/modules/alert_spec.js
+++ b/tests/e2e/modules/alert_spec.js
@@ -1,9 +1,9 @@
 const helpers = require("../global-setup");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
+
+
+
+
 
 describe("Alert module", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/modules/calendar_spec.js b/tests/e2e/modules/calendar_spec.js
index 197b927e..ebf35870 100644
--- a/tests/e2e/modules/calendar_spec.js
+++ b/tests/e2e/modules/calendar_spec.js
@@ -1,10 +1,10 @@
 const helpers = require("../global-setup");
 const serverBasicAuth = require("../../servers/basic-auth.js");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
+
+
+
+
 
 describe("Calendar module", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index b7537e09..7c72bd08 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -1,9 +1,9 @@
 const helpers = require("../global-setup");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
+
+
+
+
 
 describe("Clock set to spanish language module", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js
index e5e0f0b7..8693bfce 100644
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -1,10 +1,10 @@
 const helpers = require("../global-setup");
 const moment = require("moment");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
+
+
+
+
 
 describe("Clock module", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/modules/compliments_spec.js b/tests/e2e/modules/compliments_spec.js
index 15fc3445..8f89952a 100644
--- a/tests/e2e/modules/compliments_spec.js
+++ b/tests/e2e/modules/compliments_spec.js
@@ -1,9 +1,9 @@
 const helpers = require("../global-setup");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
+
+
+
+
 
 describe("Compliments module", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/modules/helloworld_spec.js b/tests/e2e/modules/helloworld_spec.js
index e9fd166c..0ed12554 100644
--- a/tests/e2e/modules/helloworld_spec.js
+++ b/tests/e2e/modules/helloworld_spec.js
@@ -1,10 +1,5 @@
 const helpers = require("../global-setup");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
-
 describe("Test helloworld module", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js
index 91a3bf42..15e97d07 100644
--- a/tests/e2e/modules/newsfeed_spec.js
+++ b/tests/e2e/modules/newsfeed_spec.js
@@ -1,9 +1,9 @@
 const helpers = require("../global-setup");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
+
+
+
+
 
 describe("Newsfeed module", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/modules_display_spec.js b/tests/e2e/modules_display_spec.js
index 64f75d2e..9c99f1e0 100644
--- a/tests/e2e/modules_display_spec.js
+++ b/tests/e2e/modules_display_spec.js
@@ -1,7 +1,7 @@
 const helpers = require("./global-setup");
 
-const describe = global.describe;
-const it = global.it;
+
+
 
 describe("Display of modules", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/modules_position_spec.js b/tests/e2e/modules_position_spec.js
index aac010a7..f35c53c5 100644
--- a/tests/e2e/modules_position_spec.js
+++ b/tests/e2e/modules_position_spec.js
@@ -1,7 +1,7 @@
 const helpers = require("./global-setup");
 
-const describe = global.describe;
-const it = global.it;
+
+
 
 describe("Position of modules", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/port_config.js b/tests/e2e/port_config.js
index 46ebfb23..ca2e61b8 100644
--- a/tests/e2e/port_config.js
+++ b/tests/e2e/port_config.js
@@ -1,10 +1,10 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
+
+
+
+
 
 describe("port directive configuration", function () {
 	helpers.setupTimeout(this);
diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js
index fe0077b6..8304da21 100644
--- a/tests/e2e/vendor_spec.js
+++ b/tests/e2e/vendor_spec.js
@@ -1,8 +1,8 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
 
-const describe = global.describe;
-const it = global.it;
+
+
 const before = global.before;
 const after = global.after;
 
diff --git a/tests/e2e/without_modules.js b/tests/e2e/without_modules.js
index 1b14f967..b242050c 100644
--- a/tests/e2e/without_modules.js
+++ b/tests/e2e/without_modules.js
@@ -1,9 +1,9 @@
 const helpers = require("./global-setup");
 
-const describe = global.describe;
-const it = global.it;
-const beforeEach = global.beforeEach;
-const afterEach = global.afterEach;
+
+
+
+
 
 describe("Check configuration without modules", function () {
 	helpers.setupTimeout(this);

From b26270bd134b1afd96ce79be82252744a584532a Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Fri, 11 Jun 2021 00:36:53 +0200
Subject: [PATCH 07/22] fix helloworld_spec tests

---
 tests/e2e/modules/helloworld_spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/modules/helloworld_spec.js b/tests/e2e/modules/helloworld_spec.js
index 0ed12554..c2193276 100644
--- a/tests/e2e/modules/helloworld_spec.js
+++ b/tests/e2e/modules/helloworld_spec.js
@@ -26,7 +26,7 @@ describe("Test helloworld module", function () {
 		});
 
 		it("Test message helloworld module", async function () {
-			const elem = await app.client.$("helloworld");
+			const elem = await app.client.$(".helloworld");
 			return (elem.getText(".helloworld") === "Test HelloWorld Module");
 		});
 	});
@@ -38,7 +38,7 @@ describe("Test helloworld module", function () {
 		});
 
 		it("Test message helloworld module", async function () {
-			const elem = await app.client.$("helloworld");
+			const elem = await app.client.$(".helloworld");
 			return (elem.getText(".helloworld") === "Hello World!");
 		});
 	});

From 99e5edf2c59a76b1e573ecd1d6dfaa5ad1cd397e Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Fri, 11 Jun 2021 01:00:05 +0200
Subject: [PATCH 08/22] add CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6e5df9a..8bce2ed4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel,
 - Added custom-properties for gaps around body and between modules
 - Added test case for recurring calendar events
 - Added new Environment Canada provider for default WEATHER module (weather data for Canadian locations only)
+- Added dev dependency jest, switching from mocha to jest
 
 ### Updated
 
@@ -35,6 +36,8 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel,
 
 ### Removed
 
+- switching from mocha to jest so removed following dev dependencies: chai, chai-as-promised, mocha, mocha-each, mocha-logger
+
 ### Fixed
 
 - Fix calendar start function logging inconsistency.

From 044935a1640b5298cc200824b9ffd5939c41ce4e Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Fri, 11 Jun 2021 22:14:57 +0200
Subject: [PATCH 09/22] add jest options

---
 package.json                                    |  8 ++++----
 tests/e2e/global-setup.js                       |  2 +-
 tests/unit/global_vars/defaults_modules_spec.js |  6 ------
 tests/unit/global_vars/root_path_spec.js        | 10 ----------
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 7e4f5bd1..ddf61a2d 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,10 @@
 		"install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error",
 		"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error",
 		"postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"",
-		"test": "NODE_ENV=test jest -i",
-		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i",
-		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i",
-		"test:unit": "NODE_ENV=test jest --selectProjects unit",
+		"test": "NODE_ENV=test jest -i --silent --forceExit",
+		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i --silent --forceExit",
+		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --silent --forceExit",
+		"test:unit": "NODE_ENV=test jest --selectProjects unit --silent --forceExit",
 		"test:prettier": "prettier . --check",
 		"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
 		"test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
diff --git a/tests/e2e/global-setup.js b/tests/e2e/global-setup.js
index 0451c3bd..6bc5ca93 100644
--- a/tests/e2e/global-setup.js
+++ b/tests/e2e/global-setup.js
@@ -16,7 +16,7 @@ exports.getElectronPath = function () {
 	return electronPath;
 };
 
-// Set timeout - if this is run within Travis, increase timeout
+// Set timeout - if this is run as CI Job, increase timeout
 exports.setupTimeout = function (test) {
 	if (process.env.CI) {
 		jest.setTimeout(30000);
diff --git a/tests/unit/global_vars/defaults_modules_spec.js b/tests/unit/global_vars/defaults_modules_spec.js
index e3e53d3f..4be5b48c 100644
--- a/tests/unit/global_vars/defaults_modules_spec.js
+++ b/tests/unit/global_vars/defaults_modules_spec.js
@@ -13,14 +13,8 @@ beforeAll(function () {
 		module: {},
 		__dirname: path.dirname(filePath),
 		global: {},
-		console: {
-			log: function () {
-				/*console.log("console.log(", arguments, ")");*/
-			}
-		},
 		process: {
 			on: function () {
-				/*console.log("process.on called with: ", arguments);*/
 			},
 			env: {}
 		}
diff --git a/tests/unit/global_vars/root_path_spec.js b/tests/unit/global_vars/root_path_spec.js
index 386ae389..299a92aa 100644
--- a/tests/unit/global_vars/root_path_spec.js
+++ b/tests/unit/global_vars/root_path_spec.js
@@ -13,14 +13,8 @@ beforeAll(function () {
 		module: {},
 		__dirname: path.dirname(filePath),
 		global: {},
-		console: {
-			log: function () {
-				/*console.log("console.log(", arguments, ")");*/
-			}
-		},
 		process: {
 			on: function () {
-				/*console.log("process.on called with: ", arguments);*/
 			},
 			env: {}
 		}
@@ -35,10 +29,6 @@ beforeAll(function () {
 	vm.runInNewContext(code, sandbox, fileName);
 });
 
-afterAll(function () {
-	//console.log(global);
-});
-
 describe("'global.root_path' set in js/app.js", function () {
 	const expectedSubPaths = ["modules", "serveronly", "js", "js/app.js", "js/main.js", "js/electron.js", "config"];
 

From 1a244726aa8ddbf4f2642f3eb9da84564e3bfc61 Mon Sep 17 00:00:00 2001
From: karsten13 <hassel@gmx.de>
Date: Fri, 11 Jun 2021 22:24:21 +0200
Subject: [PATCH 10/22] run prettier

---
 js/logger.js                                    |  5 ++---
 .../default/weatherforecast/weatherforecast.js  | 12 ++++++++++--
 package.json                                    | 13 ++++++++++---
 tests/e2e/env_spec.js                           |  5 -----
 tests/e2e/fonts.js                              |  2 --
 tests/e2e/modules/alert_spec.js                 |  5 -----
 tests/e2e/modules/calendar_spec.js              |  5 -----
 tests/e2e/modules/clock_es_spec.js              |  5 -----
 tests/e2e/modules/clock_spec.js                 |  7 +------
 tests/e2e/modules/compliments_spec.js           | 17 ++++++-----------
 tests/e2e/modules/helloworld_spec.js            |  4 ++--
 tests/e2e/modules/newsfeed_spec.js              |  5 -----
 tests/e2e/modules_display_spec.js               |  7 ++-----
 tests/e2e/modules_position_spec.js              |  5 +----
 tests/e2e/port_config.js                        |  5 -----
 tests/e2e/vendor_spec.js                        |  2 --
 tests/e2e/without_modules.js                    |  9 ++-------
 tests/unit/classes/translator_spec.js           |  5 ++---
 tests/unit/functions/newsfeed_spec.js           |  2 +-
 tests/unit/global_vars/defaults_modules_spec.js |  3 +--
 tests/unit/global_vars/root_path_spec.js        |  3 +--
 21 files changed, 41 insertions(+), 85 deletions(-)

diff --git a/js/logger.js b/js/logger.js
index 1e74c850..7c802924 100644
--- a/js/logger.js
+++ b/js/logger.js
@@ -22,7 +22,6 @@
 		root.Log = factory(root.config);
 	}
 })(this, function (config) {
-
 	let logLevel = {
 		debug: Function.prototype.bind.call(console.debug, console),
 		log: Function.prototype.bind.call(console.log, console),
@@ -37,8 +36,8 @@
 	};
 
 	if (process.env.NODE_ENV.trim() !== "test") {
-		logLevel.push({timeStamp: Function.prototype.bind.call(console.timeStamp, console)});
-	};
+		logLevel.push({ timeStamp: Function.prototype.bind.call(console.timeStamp, console) });
+	}
 
 	logLevel.setLogLevel = function (newLevel) {
 		if (newLevel) {
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index 39a7119b..23f50d49 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -341,7 +341,11 @@ Module.register("weatherforecast", {
 	 */
 	processWeather: function (data, momenttz) {
 		let mom;
-		if (momenttz === null) {mom = moment} else {mom = momenttz};
+		if (momenttz === null) {
+			mom = moment;
+		} else {
+			mom = momenttz;
+		}
 		// Forcast16 (paid) API endpoint provides this data.  Onecall endpoint
 		// does not.
 		if (data.city) {
@@ -486,7 +490,11 @@ Module.register("weatherforecast", {
 	 */
 	processRain: function (forecast, allForecasts, momenttz) {
 		let mom;
-		if (momenttz === null) {mom = moment} else {mom = momenttz};
+		if (momenttz === null) {
+			mom = moment;
+		} else {
+			mom = momenttz;
+		}
 		//If the amount of rain actually is a number, return it
 		if (!isNaN(forecast.rain)) {
 			return forecast.rain;
diff --git a/package.json b/package.json
index ddf61a2d..991cd336 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,9 @@
 		"projects": [
 			{
 				"displayName": "unit",
-				"testMatch": ["**/tests/unit/**/*.[jt]s?(x)"],
+				"testMatch": [
+					"**/tests/unit/**/*.[jt]s?(x)"
+				],
 				"moduleNameMapper": {
 					"node_helper": "<rootDir>/js/node_helper.js",
 					"logger": "<rootDir>/js/logger.js",
@@ -105,8 +107,13 @@
 			},
 			{
 				"displayName": "e2e",
-				"testMatch": ["**/tests/e2e/**/*.[jt]s?(x)"],
-				"testPathIgnorePatterns": ["<rootDir>/tests/e2e/modules/mocks", "<rootDir>/tests/e2e/global-setup.js"]
+				"testMatch": [
+					"**/tests/e2e/**/*.[jt]s?(x)"
+				],
+				"testPathIgnorePatterns": [
+					"<rootDir>/tests/e2e/modules/mocks",
+					"<rootDir>/tests/e2e/global-setup.js"
+				]
 			}
 		]
 	}
diff --git a/tests/e2e/env_spec.js b/tests/e2e/env_spec.js
index d497f256..706274a2 100644
--- a/tests/e2e/env_spec.js
+++ b/tests/e2e/env_spec.js
@@ -1,11 +1,6 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
 
-
-
-
-
-
 describe("Electron app environment", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/fonts.js b/tests/e2e/fonts.js
index 60ef2ac4..b1459294 100644
--- a/tests/e2e/fonts.js
+++ b/tests/e2e/fonts.js
@@ -1,8 +1,6 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
 
-
-
 describe("All font files from roboto.css should be downloadable", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/modules/alert_spec.js b/tests/e2e/modules/alert_spec.js
index 8a5e07be..12e724f0 100644
--- a/tests/e2e/modules/alert_spec.js
+++ b/tests/e2e/modules/alert_spec.js
@@ -1,10 +1,5 @@
 const helpers = require("../global-setup");
 
-
-
-
-
-
 describe("Alert module", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/modules/calendar_spec.js b/tests/e2e/modules/calendar_spec.js
index ebf35870..980eca58 100644
--- a/tests/e2e/modules/calendar_spec.js
+++ b/tests/e2e/modules/calendar_spec.js
@@ -1,11 +1,6 @@
 const helpers = require("../global-setup");
 const serverBasicAuth = require("../../servers/basic-auth.js");
 
-
-
-
-
-
 describe("Calendar module", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index 7c72bd08..30c4faa6 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -1,10 +1,5 @@
 const helpers = require("../global-setup");
 
-
-
-
-
-
 describe("Clock set to spanish language module", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js
index 8693bfce..13ed9191 100644
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -1,11 +1,6 @@
 const helpers = require("../global-setup");
 const moment = require("moment");
 
-
-
-
-
-
 describe("Clock module", function () {
 	helpers.setupTimeout(this);
 
@@ -105,7 +100,7 @@ describe("Clock module", function () {
 			const currentWeekNumber = moment().week();
 			const weekToShow = "Week " + currentWeekNumber;
 			const elem = await app.client.$(".clock .week");
-			return (elem.getText(".clock .week") === weekToShow);
+			return elem.getText(".clock .week") === weekToShow;
 		});
 	});
 
diff --git a/tests/e2e/modules/compliments_spec.js b/tests/e2e/modules/compliments_spec.js
index 8f89952a..81c6e982 100644
--- a/tests/e2e/modules/compliments_spec.js
+++ b/tests/e2e/modules/compliments_spec.js
@@ -1,10 +1,5 @@
 const helpers = require("../global-setup");
 
-
-
-
-
-
 describe("Compliments module", function () {
 	helpers.setupTimeout(this);
 
@@ -36,7 +31,7 @@ describe("Compliments module", function () {
 				// if morning check
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(["Hi", "Good Morning", "Morning test"]).toContain(text) 
+					expect(["Hi", "Good Morning", "Morning test"]).toContain(text);
 				});
 			}
 		});
@@ -47,7 +42,7 @@ describe("Compliments module", function () {
 				// if afternoon check
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(["Hello", "Good Afternoon", "Afternoon test"]).toContain(text) 
+					expect(["Hello", "Good Afternoon", "Afternoon test"]).toContain(text);
 				});
 			}
 		});
@@ -58,7 +53,7 @@ describe("Compliments module", function () {
 				// if evening check
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(["Hello There", "Good Evening", "Evening test"]).toContain(text) 
+					expect(["Hello There", "Good Evening", "Evening test"]).toContain(text);
 				});
 			}
 		});
@@ -74,7 +69,7 @@ describe("Compliments module", function () {
 			it("Show anytime because if configure empty parts of day compliments and set anytime compliments", async function () {
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(["Anytime here"]).toContain(text) 
+					expect(["Anytime here"]).toContain(text);
 				});
 			});
 		});
@@ -88,7 +83,7 @@ describe("Compliments module", function () {
 			it("Show anytime compliments", async function () {
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(["Anytime here"]).toContain(text) 
+					expect(["Anytime here"]).toContain(text);
 				});
 			});
 		});
@@ -104,7 +99,7 @@ describe("Compliments module", function () {
 			it("Show happy new year compliment on new years day", async function () {
 				const elem = await app.client.$(".compliments");
 				return elem.getText(".compliments").then(function (text) {
-					expect(["Happy new year!"]).toContain(text) 
+					expect(["Happy new year!"]).toContain(text);
 				});
 			});
 		});
diff --git a/tests/e2e/modules/helloworld_spec.js b/tests/e2e/modules/helloworld_spec.js
index c2193276..49e9f8f3 100644
--- a/tests/e2e/modules/helloworld_spec.js
+++ b/tests/e2e/modules/helloworld_spec.js
@@ -27,7 +27,7 @@ describe("Test helloworld module", function () {
 
 		it("Test message helloworld module", async function () {
 			const elem = await app.client.$(".helloworld");
-			return (elem.getText(".helloworld") === "Test HelloWorld Module");
+			return elem.getText(".helloworld") === "Test HelloWorld Module";
 		});
 	});
 
@@ -39,7 +39,7 @@ describe("Test helloworld module", function () {
 
 		it("Test message helloworld module", async function () {
 			const elem = await app.client.$(".helloworld");
-			return (elem.getText(".helloworld") === "Hello World!");
+			return elem.getText(".helloworld") === "Hello World!";
 		});
 	});
 });
diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js
index 15e97d07..fe544a0b 100644
--- a/tests/e2e/modules/newsfeed_spec.js
+++ b/tests/e2e/modules/newsfeed_spec.js
@@ -1,10 +1,5 @@
 const helpers = require("../global-setup");
 
-
-
-
-
-
 describe("Newsfeed module", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/modules_display_spec.js b/tests/e2e/modules_display_spec.js
index 9c99f1e0..71a1f670 100644
--- a/tests/e2e/modules_display_spec.js
+++ b/tests/e2e/modules_display_spec.js
@@ -1,8 +1,5 @@
 const helpers = require("./global-setup");
 
-
-
-
 describe("Display of modules", function () {
 	helpers.setupTimeout(this);
 
@@ -30,12 +27,12 @@ describe("Display of modules", function () {
 
 		it("should show the test header", async () => {
 			const elem = await app.client.$("#module_0_helloworld .module-header", 10000);
-			return (elem.getText("#module_0_helloworld .module-header") === "TEST_HEADER");
+			return elem.getText("#module_0_helloworld .module-header") === "TEST_HEADER";
 		});
 
 		it("should show no header if no header text is specified", async () => {
 			const elem = await app.client.$("#module_1_helloworld .module-header", 10000);
-			return (elem.getText("#module_1_helloworld .module-header") === false);
+			return elem.getText("#module_1_helloworld .module-header") === false;
 		});
 	});
 });
diff --git a/tests/e2e/modules_position_spec.js b/tests/e2e/modules_position_spec.js
index f35c53c5..80525afb 100644
--- a/tests/e2e/modules_position_spec.js
+++ b/tests/e2e/modules_position_spec.js
@@ -1,8 +1,5 @@
 const helpers = require("./global-setup");
 
-
-
-
 describe("Position of modules", function () {
 	helpers.setupTimeout(this);
 
@@ -31,7 +28,7 @@ describe("Position of modules", function () {
 			const className = position.replace("_", ".");
 			it("should show text in " + position, function () {
 				return app.client.$("." + className).then((result) => {
-					return (result.getText("." + className) === "Text in " + position);
+					return result.getText("." + className) === "Text in " + position;
 				});
 			});
 		}
diff --git a/tests/e2e/port_config.js b/tests/e2e/port_config.js
index ca2e61b8..da489414 100644
--- a/tests/e2e/port_config.js
+++ b/tests/e2e/port_config.js
@@ -1,11 +1,6 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
 
-
-
-
-
-
 describe("port directive configuration", function () {
 	helpers.setupTimeout(this);
 
diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js
index 8304da21..fc154a88 100644
--- a/tests/e2e/vendor_spec.js
+++ b/tests/e2e/vendor_spec.js
@@ -1,8 +1,6 @@
 const helpers = require("./global-setup");
 const fetch = require("node-fetch");
 
-
-
 const before = global.before;
 const after = global.after;
 
diff --git a/tests/e2e/without_modules.js b/tests/e2e/without_modules.js
index b242050c..499caad0 100644
--- a/tests/e2e/without_modules.js
+++ b/tests/e2e/without_modules.js
@@ -1,10 +1,5 @@
 const helpers = require("./global-setup");
 
-
-
-
-
-
 describe("Check configuration without modules", function () {
 	helpers.setupTimeout(this);
 
@@ -31,11 +26,11 @@ describe("Check configuration without modules", function () {
 
 	it("Show the message MagicMirror title", async function () {
 		const elem = await app.client.$("#module_1_helloworld .module-content");
-		return (elem.getText("#module_1_helloworld .module-content") === "Magic Mirror2");
+		return elem.getText("#module_1_helloworld .module-content") === "Magic Mirror2";
 	});
 
 	it("Show the text Michael's website", async function () {
 		const elem = await app.client.$("#module_5_helloworld .module-content");
-		return (elem.getText("#module_5_helloworld .module-content") === "www.michaelteeuw.nl");
+		return elem.getText("#module_5_helloworld .module-content") === "www.michaelteeuw.nl";
 	});
 });
diff --git a/tests/unit/classes/translator_spec.js b/tests/unit/classes/translator_spec.js
index df1934fe..fe942753 100644
--- a/tests/unit/classes/translator_spec.js
+++ b/tests/unit/classes/translator_spec.js
@@ -18,16 +18,15 @@ describe("Translator", function () {
 
 		server = app.listen(3000);
 
-		server.on('connection', (socket) => {
+		server.on("connection", (socket) => {
 			sockets.add(socket);
 		});
-
 	});
 
 	afterAll(function () {
 		for (const socket of sockets) {
 			socket.destroy();
-	
+
 			sockets.delete(socket);
 		}
 
diff --git a/tests/unit/functions/newsfeed_spec.js b/tests/unit/functions/newsfeed_spec.js
index 5ba3c55c..5740508c 100644
--- a/tests/unit/functions/newsfeed_spec.js
+++ b/tests/unit/functions/newsfeed_spec.js
@@ -11,5 +11,5 @@ describe("Functions into modules/default/newsfeed/newsfeed.js", function () {
 		require("../../../modules/default/newsfeed/newsfeed.js");
 	});
 
-	test.skip('skip', () => {});
+	test.skip("skip", () => {});
 });
diff --git a/tests/unit/global_vars/defaults_modules_spec.js b/tests/unit/global_vars/defaults_modules_spec.js
index 4be5b48c..08899a2d 100644
--- a/tests/unit/global_vars/defaults_modules_spec.js
+++ b/tests/unit/global_vars/defaults_modules_spec.js
@@ -14,8 +14,7 @@ beforeAll(function () {
 		__dirname: path.dirname(filePath),
 		global: {},
 		process: {
-			on: function () {
-			},
+			on: function () {},
 			env: {}
 		}
 	};
diff --git a/tests/unit/global_vars/root_path_spec.js b/tests/unit/global_vars/root_path_spec.js
index 299a92aa..249066dc 100644
--- a/tests/unit/global_vars/root_path_spec.js
+++ b/tests/unit/global_vars/root_path_spec.js
@@ -14,8 +14,7 @@ beforeAll(function () {
 		__dirname: path.dirname(filePath),
 		global: {},
 		process: {
-			on: function () {
-			},
+			on: function () {},
 			env: {}
 		}
 	};

From 10d3a284e9a927293f71b6615a15c6d64a4fada1 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Fri, 11 Jun 2021 23:10:41 +0200
Subject: [PATCH 11/22] fix js lint warnings

---
 js/app.js   | 1 -
 js/class.js | 1 -
 js/main.js  | 7 -------
 3 files changed, 9 deletions(-)

diff --git a/js/app.js b/js/app.js
index e5156b19..6315370b 100644
--- a/js/app.js
+++ b/js/app.js
@@ -180,7 +180,6 @@ function App() {
 	 *
 	 * @param {string} a Version number a.
 	 * @param {string} b Version number b.
-	 *
 	 * @returns {number} A positive number if a is larger than b, a negative
 	 * number if a is smaller and 0 if they are the same
 	 */
diff --git a/js/class.js b/js/class.js
index 9c46a894..b25ced0a 100644
--- a/js/class.js
+++ b/js/class.js
@@ -84,7 +84,6 @@
  * Define the clone method for later use. Helper Method.
  *
  * @param {object} obj Object to be cloned
- *
  * @returns {object} the cloned object
  */
 function cloneObject(obj) {
diff --git a/js/main.js b/js/main.js
index c3141fa9..bc128194 100644
--- a/js/main.js
+++ b/js/main.js
@@ -70,7 +70,6 @@ const MM = (function () {
 	 * Select the wrapper dom object for a specific position.
 	 *
 	 * @param {string} position The name of the position.
-	 *
 	 * @returns {HTMLElement} the wrapper element
 	 */
 	const selectWrapper = function (position) {
@@ -106,7 +105,6 @@ const MM = (function () {
 	 *
 	 * @param {Module} module The module that needs an update.
 	 * @param {number} [speed] The (optional) number of microseconds for the animation.
-	 *
 	 * @returns {Promise} Resolved when the dom is fully updated.
 	 */
 	const updateDom = function (module, speed) {
@@ -136,7 +134,6 @@ const MM = (function () {
 	 * @param {number} [speed] The (optional) number of microseconds for the animation.
 	 * @param {string} newHeader The new header that is generated.
 	 * @param {HTMLElement} newContent The new content that is generated.
-	 *
 	 * @returns {Promise} Resolved when the module dom has been updated.
 	 */
 	const updateDomWithContent = function (module, speed, newHeader, newContent) {
@@ -174,7 +171,6 @@ const MM = (function () {
 	 * @param {Module} module The module to check.
 	 * @param {string} newHeader The new header that is generated.
 	 * @param {HTMLElement} newContent The new content that is generated.
-	 *
 	 * @returns {boolean} True if the module need an update, false otherwise
 	 */
 	const moduleNeedsUpdate = function (module, newHeader, newContent) {
@@ -390,7 +386,6 @@ const MM = (function () {
 		 * Filter modules with the specified classes.
 		 *
 		 * @param {string|string[]} className one or multiple classnames (array or space divided).
-		 *
 		 * @returns {Module[]} Filtered collection of modules.
 		 */
 		const withClass = function (className) {
@@ -401,7 +396,6 @@ const MM = (function () {
 		 * Filter modules without the specified classes.
 		 *
 		 * @param {string|string[]} className one or multiple classnames (array or space divided).
-		 *
 		 * @returns {Module[]} Filtered collection of modules.
 		 */
 		const exceptWithClass = function (className) {
@@ -413,7 +407,6 @@ const MM = (function () {
 		 *
 		 * @param {string|string[]} className one or multiple classnames (array or space divided).
 		 * @param {boolean} include if the filter should include or exclude the modules with the specific classes.
-		 *
 		 * @returns {Module[]} Filtered collection of modules.
 		 */
 		const modulesByClass = function (className, include) {

From fca6707a299ac62c9d1974e514d2c32b4861eaae Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Fri, 11 Jun 2021 23:11:30 +0200
Subject: [PATCH 12/22] add eslint-plugin-jest

---
 .eslintrc.json | 4 ++--
 package.json   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index f24799a5..3e685a0d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,10 +1,10 @@
 {
 	"extends": ["eslint:recommended", "plugin:prettier/recommended", "plugin:jsdoc/recommended"],
-	"plugins": ["prettier", "jsdoc"],
+	"plugins": ["prettier", "jsdoc", "jest"],
 	"env": {
 		"browser": true,
 		"es6": true,
-		"mocha": true,
+		"jest/globals": true,
 		"node": true
 	},
 	"globals": {
diff --git a/package.json b/package.json
index 991cd336..8653b5e3 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-jsdoc": "^35.0.0",
 		"eslint-plugin-prettier": "^3.4.0",
+		"eslint-plugin-jest": "^24.3.6",
 		"express-basic-auth": "^1.2.0",
 		"husky": "^6.0.0",
 		"jest": "27.0.4",

From 298542b5315e5f904e4a5967986c6177bd65fef4 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Fri, 11 Jun 2021 23:31:37 +0200
Subject: [PATCH 13/22] enable missing translation messages

---
 package.json                   | 2 +-
 tests/e2e/translations_spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 8653b5e3..3a41d498 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"",
 		"test": "NODE_ENV=test jest -i --silent --forceExit",
 		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i --silent --forceExit",
-		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --silent --forceExit",
+		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --forceExit",
 		"test:unit": "NODE_ENV=test jest --selectProjects unit --silent --forceExit",
 		"test:prettier": "prettier . --check",
 		"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
diff --git a/tests/e2e/translations_spec.js b/tests/e2e/translations_spec.js
index ddf42d84..1be7eca6 100644
--- a/tests/e2e/translations_spec.js
+++ b/tests/e2e/translations_spec.js
@@ -209,8 +209,8 @@ describe("Translations", function () {
 						expect(keys).toEqual(base);
 					} catch (e) {
 						if (e.message.match(/expect.*toEqual/)) {
-							// const diff = base.filter((key) => !keys.includes(key));
-							// console.log(`Missing Translations for language ${language}: ${diff}`);
+							const diff = base.filter((key) => !keys.includes(key));
+							console.log(`Missing Translations for language ${language}: ${diff}`);
 						} else {
 							throw e;
 						}

From a5f7c946cc26abcf8ec4b6c5d4398646c19c6a0f Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Sat, 12 Jun 2021 20:03:20 +0200
Subject: [PATCH 14/22] jest setup changes, increase setMaxListeners, disable
 console.log in tests/unit/global_vars

---
 package.json                                    | 8 ++++----
 tests/e2e/global-setup.js                       | 4 ++++
 tests/e2e/vendor_spec.js                        | 6 ++++--
 tests/unit/global_vars/defaults_modules_spec.js | 9 +++++++++
 tests/unit/global_vars/root_path_spec.js        | 9 +++++++++
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 3a41d498..08d2b1b1 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,10 @@
 		"install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error",
 		"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error",
 		"postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"",
-		"test": "NODE_ENV=test jest -i --silent --forceExit",
-		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i --silent --forceExit",
-		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --forceExit",
-		"test:unit": "NODE_ENV=test jest --selectProjects unit --silent --forceExit",
+		"test": "NODE_ENV=test jest --detectOpenHandles --forceExit",
+		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest --detectOpenHandles --forceExit",
+		"test:e2e": "NODE_ENV=test jest --selectProjects e2e --detectOpenHandles --forceExit",
+		"test:unit": "NODE_ENV=test jest --selectProjects unit --detectOpenHandles --forceExit",
 		"test:prettier": "prettier . --check",
 		"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
 		"test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
diff --git a/tests/e2e/global-setup.js b/tests/e2e/global-setup.js
index 6bc5ca93..a1e0685b 100644
--- a/tests/e2e/global-setup.js
+++ b/tests/e2e/global-setup.js
@@ -7,6 +7,7 @@
 const Application = require("spectron").Application;
 const assert = require("assert");
 const path = require("path");
+const EventEmitter = require("events");
 
 exports.getElectronPath = function () {
 	let electronPath = path.join(__dirname, "..", "..", "node_modules", ".bin", "electron");
@@ -26,6 +27,9 @@ exports.setupTimeout = function (test) {
 };
 
 exports.startApplication = function (options) {
+	const emitter = new EventEmitter();
+	emitter.setMaxListeners(100);
+
 	options.path = exports.getElectronPath();
 	if (process.env.CI) {
 		options.startTimeout = 30000;
diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js
index fc154a88..b5289c2f 100644
--- a/tests/e2e/vendor_spec.js
+++ b/tests/e2e/vendor_spec.js
@@ -27,19 +27,21 @@ describe("Vendors", function () {
 	describe("Get list vendors", function () {
 		const vendors = require(__dirname + "/../../vendor/vendor.js");
 		Object.keys(vendors).forEach((vendor) => {
-			it(`should return 200 HTTP code for vendor "${vendor}"`, function () {
+			it(`should return 200 HTTP code for vendor "${vendor}"`, function (done) {
 				const urlVendor = "http://localhost:8080/vendor/" + vendors[vendor];
 				fetch(urlVendor).then((res) => {
 					expect(res.status).toBe(200);
+					done();
 				});
 			});
 		});
 
 		Object.keys(vendors).forEach((vendor) => {
-			it(`should return 404 HTTP code for vendor https://localhost/"${vendor}"`, function () {
+			it(`should return 404 HTTP code for vendor https://localhost/"${vendor}"`, function (done) {
 				const urlVendor = "http://localhost:8080/" + vendors[vendor];
 				fetch(urlVendor).then((res) => {
 					expect(res.status).toBe(404);
+					done();
 				});
 			});
 		});
diff --git a/tests/unit/global_vars/defaults_modules_spec.js b/tests/unit/global_vars/defaults_modules_spec.js
index 08899a2d..1c9137ce 100644
--- a/tests/unit/global_vars/defaults_modules_spec.js
+++ b/tests/unit/global_vars/defaults_modules_spec.js
@@ -4,11 +4,16 @@ const vm = require("vm");
 
 const basedir = path.join(__dirname, "../../..");
 
+const mockedWarn = () => {};
+const originalWarn = console.log;
+
 beforeAll(function () {
 	const fileName = "js/app.js";
 	const filePath = path.join(basedir, fileName);
 	const code = fs.readFileSync(filePath);
 
+	console.log = mockedWarn;
+
 	sandbox = {
 		module: {},
 		__dirname: path.dirname(filePath),
@@ -28,6 +33,10 @@ beforeAll(function () {
 	vm.runInNewContext(code, sandbox, fileName);
 });
 
+afterAll(function () {
+	console.log = originalWarn;
+});
+
 describe("Default modules set in modules/default/defaultmodules.js", function () {
 	const expectedDefaultModules = require("../../../modules/default/defaultmodules");
 
diff --git a/tests/unit/global_vars/root_path_spec.js b/tests/unit/global_vars/root_path_spec.js
index 249066dc..8cf8b521 100644
--- a/tests/unit/global_vars/root_path_spec.js
+++ b/tests/unit/global_vars/root_path_spec.js
@@ -2,6 +2,9 @@ const fs = require("fs");
 const path = require("path");
 const vm = require("vm");
 
+const mockedWarn = () => {};
+const originalWarn = console.log;
+
 beforeAll(function () {
 	const basedir = path.join(__dirname, "../../..");
 
@@ -9,6 +12,8 @@ beforeAll(function () {
 	const filePath = path.join(basedir, fileName);
 	const code = fs.readFileSync(filePath);
 
+	console.log = mockedWarn;
+
 	sandbox = {
 		module: {},
 		__dirname: path.dirname(filePath),
@@ -28,6 +33,10 @@ beforeAll(function () {
 	vm.runInNewContext(code, sandbox, fileName);
 });
 
+afterAll(function () {
+	console.log = originalWarn;
+});
+
 describe("'global.root_path' set in js/app.js", function () {
 	const expectedSubPaths = ["modules", "serveronly", "js", "js/app.js", "js/main.js", "js/electron.js", "config"];
 

From 2af4009a93616918afaa2be8934d8130f93577a8 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Sat, 12 Jun 2021 22:17:51 +0200
Subject: [PATCH 15/22] change missing translations log, disable console.log in
 unit tests

---
 package.json                                    | 6 ++++++
 tests/e2e/translations_spec.js                  | 7 ++++++-
 tests/unit/global_vars/defaults_modules_spec.js | 9 ---------
 tests/unit/global_vars/root_path_spec.js        | 9 ---------
 tests/unit/setup_unit.js                        | 1 +
 5 files changed, 13 insertions(+), 19 deletions(-)
 create mode 100644 tests/unit/setup_unit.js

diff --git a/package.json b/package.json
index 08d2b1b1..dc5c493f 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,12 @@
 				"testMatch": [
 					"**/tests/unit/**/*.[jt]s?(x)"
 				],
+				"testPathIgnorePatterns": [
+					"<rootDir>/tests/unit/setup_unit.js"
+				],
+				"setupFiles": [
+					"<rootDir>/tests/unit/setup_unit.js"
+				],
 				"moduleNameMapper": {
 					"node_helper": "<rootDir>/js/node_helper.js",
 					"logger": "<rootDir>/js/logger.js",
diff --git a/tests/e2e/translations_spec.js b/tests/e2e/translations_spec.js
index 1be7eca6..d05837cd 100644
--- a/tests/e2e/translations_spec.js
+++ b/tests/e2e/translations_spec.js
@@ -153,6 +153,7 @@ describe("Translations", function () {
 
 	describe("Same keys", function () {
 		let base;
+		let missing = [];
 
 		beforeAll(function (done) {
 			const dom = new JSDOM(
@@ -170,6 +171,10 @@ describe("Translations", function () {
 			};
 		});
 
+		afterAll(function () {
+			console.log(missing);
+		});
+
 		for (let language in translations) {
 			if (language === "en") {
 				continue;
@@ -210,7 +215,7 @@ describe("Translations", function () {
 					} catch (e) {
 						if (e.message.match(/expect.*toEqual/)) {
 							const diff = base.filter((key) => !keys.includes(key));
-							console.log(`Missing Translations for language ${language}: ${diff}`);
+							missing.push(`Missing Translations for language ${language}: ${diff}`);
 						} else {
 							throw e;
 						}
diff --git a/tests/unit/global_vars/defaults_modules_spec.js b/tests/unit/global_vars/defaults_modules_spec.js
index 1c9137ce..08899a2d 100644
--- a/tests/unit/global_vars/defaults_modules_spec.js
+++ b/tests/unit/global_vars/defaults_modules_spec.js
@@ -4,16 +4,11 @@ const vm = require("vm");
 
 const basedir = path.join(__dirname, "../../..");
 
-const mockedWarn = () => {};
-const originalWarn = console.log;
-
 beforeAll(function () {
 	const fileName = "js/app.js";
 	const filePath = path.join(basedir, fileName);
 	const code = fs.readFileSync(filePath);
 
-	console.log = mockedWarn;
-
 	sandbox = {
 		module: {},
 		__dirname: path.dirname(filePath),
@@ -33,10 +28,6 @@ beforeAll(function () {
 	vm.runInNewContext(code, sandbox, fileName);
 });
 
-afterAll(function () {
-	console.log = originalWarn;
-});
-
 describe("Default modules set in modules/default/defaultmodules.js", function () {
 	const expectedDefaultModules = require("../../../modules/default/defaultmodules");
 
diff --git a/tests/unit/global_vars/root_path_spec.js b/tests/unit/global_vars/root_path_spec.js
index 8cf8b521..249066dc 100644
--- a/tests/unit/global_vars/root_path_spec.js
+++ b/tests/unit/global_vars/root_path_spec.js
@@ -2,9 +2,6 @@ const fs = require("fs");
 const path = require("path");
 const vm = require("vm");
 
-const mockedWarn = () => {};
-const originalWarn = console.log;
-
 beforeAll(function () {
 	const basedir = path.join(__dirname, "../../..");
 
@@ -12,8 +9,6 @@ beforeAll(function () {
 	const filePath = path.join(basedir, fileName);
 	const code = fs.readFileSync(filePath);
 
-	console.log = mockedWarn;
-
 	sandbox = {
 		module: {},
 		__dirname: path.dirname(filePath),
@@ -33,10 +28,6 @@ beforeAll(function () {
 	vm.runInNewContext(code, sandbox, fileName);
 });
 
-afterAll(function () {
-	console.log = originalWarn;
-});
-
 describe("'global.root_path' set in js/app.js", function () {
 	const expectedSubPaths = ["modules", "serveronly", "js", "js/app.js", "js/main.js", "js/electron.js", "config"];
 
diff --git a/tests/unit/setup_unit.js b/tests/unit/setup_unit.js
new file mode 100644
index 00000000..b4b7574c
--- /dev/null
+++ b/tests/unit/setup_unit.js
@@ -0,0 +1 @@
+console.log = () => {};

From e8956b0b550760e63b6591af332d11b1fc283552 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Sat, 12 Jun 2021 22:52:05 +0200
Subject: [PATCH 16/22] update package-lock.json

---
 package-lock.json | 1940 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 1590 insertions(+), 350 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 18fd7ba7..8dc70a74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -152,6 +152,12 @@
 				"@babel/types": "^7.12.13"
 			}
 		},
+		"@babel/helper-plugin-utils": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+			"integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+			"dev": true
+		},
 		"@babel/helper-replace-supers": {
 			"version": "7.13.12",
 			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
@@ -271,6 +277,123 @@
 			"integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==",
 			"dev": true
 		},
+		"@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-bigint": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.12.13"
+			}
+		},
+		"@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			}
+		},
+		"@babel/plugin-syntax-json-strings": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-logical-assignment-operators": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			}
+		},
+		"@babel/plugin-syntax-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-numeric-separator": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			}
+		},
+		"@babel/plugin-syntax-object-rest-spread": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-optional-catch-binding": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-optional-chaining": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			}
+		},
+		"@babel/plugin-syntax-top-level-await": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			}
+		},
+		"@babel/plugin-syntax-typescript": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz",
+			"integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			}
+		},
 		"@babel/template": {
 			"version": "7.12.13",
 			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
@@ -336,6 +459,12 @@
 				"to-fast-properties": "^2.0.0"
 			}
 		},
+		"@bcoe/v8-coverage": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+			"dev": true
+		},
 		"@electron/get": {
 			"version": "1.12.4",
 			"resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.4.tgz",
@@ -464,6 +593,197 @@
 			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
 			"dev": true
 		},
+		"@jest/console": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-27.0.2.tgz",
+			"integrity": "sha512-/zYigssuHLImGeMAACkjI4VLAiiJznHgAl3xnFT19iWyct2LhrH3KXOjHRmxBGTkiPLZKKAJAgaPpiU9EZ9K+w==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"jest-message-util": "^27.0.2",
+				"jest-util": "^27.0.2",
+				"slash": "^3.0.0"
+			}
+		},
+		"@jest/core": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.4.tgz",
+			"integrity": "sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.0.2",
+				"@jest/reporters": "^27.0.4",
+				"@jest/test-result": "^27.0.2",
+				"@jest/transform": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-changed-files": "^27.0.2",
+				"jest-config": "^27.0.4",
+				"jest-haste-map": "^27.0.2",
+				"jest-message-util": "^27.0.2",
+				"jest-regex-util": "^27.0.1",
+				"jest-resolve": "^27.0.4",
+				"jest-resolve-dependencies": "^27.0.4",
+				"jest-runner": "^27.0.4",
+				"jest-runtime": "^27.0.4",
+				"jest-snapshot": "^27.0.4",
+				"jest-util": "^27.0.2",
+				"jest-validate": "^27.0.2",
+				"jest-watcher": "^27.0.2",
+				"micromatch": "^4.0.4",
+				"p-each-series": "^2.1.0",
+				"rimraf": "^3.0.0",
+				"slash": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			}
+		},
+		"@jest/environment": {
+			"version": "27.0.3",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.0.3.tgz",
+			"integrity": "sha512-pN9m7fbKsop5vc3FOfH8NF7CKKdRbEZzcxfIo1n2TT6ucKWLFq0P6gCJH0GpnQp036++yY9utHOxpeT1WnkWTA==",
+			"dev": true,
+			"requires": {
+				"@jest/fake-timers": "^27.0.3",
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"jest-mock": "^27.0.3"
+			}
+		},
+		"@jest/fake-timers": {
+			"version": "27.0.3",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.0.3.tgz",
+			"integrity": "sha512-fQ+UCKRIYKvTCEOyKPnaPnomLATIhMnHC/xPZ7yT1Uldp7yMgMxoYIFidDbpSTgB79+/U+FgfoD30c6wg3IUjA==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"@sinonjs/fake-timers": "^7.0.2",
+				"@types/node": "*",
+				"jest-message-util": "^27.0.2",
+				"jest-mock": "^27.0.3",
+				"jest-util": "^27.0.2"
+			}
+		},
+		"@jest/globals": {
+			"version": "27.0.3",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.0.3.tgz",
+			"integrity": "sha512-OzsIuf7uf+QalqAGbjClyezzEcLQkdZ+7PejUrZgDs+okdAK8GwRCGcYCirHvhMBBQh60Jr3NlIGbn/KBPQLEQ==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.0.3",
+				"@jest/types": "^27.0.2",
+				"expect": "^27.0.2"
+			}
+		},
+		"@jest/reporters": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.4.tgz",
+			"integrity": "sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg==",
+			"dev": true,
+			"requires": {
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@jest/console": "^27.0.2",
+				"@jest/test-result": "^27.0.2",
+				"@jest/transform": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"chalk": "^4.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.2",
+				"graceful-fs": "^4.2.4",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-instrument": "^4.0.3",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.0.2",
+				"jest-haste-map": "^27.0.2",
+				"jest-resolve": "^27.0.4",
+				"jest-util": "^27.0.2",
+				"jest-worker": "^27.0.2",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.0",
+				"string-length": "^4.0.1",
+				"terminal-link": "^2.0.0",
+				"v8-to-istanbul": "^7.0.0"
+			}
+		},
+		"@jest/source-map": {
+			"version": "27.0.1",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.0.1.tgz",
+			"integrity": "sha512-yMgkF0f+6WJtDMdDYNavmqvbHtiSpwRN2U/W+6uztgfqgkq/PXdKPqjBTUF1RD/feth4rH5N3NW0T5+wIuln1A==",
+			"dev": true,
+			"requires": {
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.2.4",
+				"source-map": "^0.6.0"
+			}
+		},
+		"@jest/test-result": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.0.2.tgz",
+			"integrity": "sha512-gcdWwL3yP5VaIadzwQtbZyZMgpmes8ryBAJp70tuxghiA8qL4imJyZex+i+USQH2H4jeLVVszhwntgdQ97fccA==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"collect-v8-coverage": "^1.0.0"
+			}
+		},
+		"@jest/test-sequencer": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz",
+			"integrity": "sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ==",
+			"dev": true,
+			"requires": {
+				"@jest/test-result": "^27.0.2",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.0.2",
+				"jest-runtime": "^27.0.4"
+			}
+		},
+		"@jest/transform": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.0.2.tgz",
+			"integrity": "sha512-H8sqKlgtDfVog/s9I4GG2XMbi4Ar7RBxjsKQDUhn2XHAi3NG+GoQwWMER+YfantzExbjNqQvqBHzo/G2pfTiPw==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.1.0",
+				"@jest/types": "^27.0.2",
+				"babel-plugin-istanbul": "^6.0.0",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^1.4.0",
+				"fast-json-stable-stringify": "^2.0.0",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.0.2",
+				"jest-regex-util": "^27.0.1",
+				"jest-util": "^27.0.2",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.1",
+				"slash": "^3.0.0",
+				"source-map": "^0.6.1",
+				"write-file-atomic": "^3.0.0"
+			}
+		},
+		"@jest/types": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.2.tgz",
+			"integrity": "sha512-XpjCtJ/99HB4PmyJ2vgmN7vT+JLP7RW1FBT9RgnMFS4Dt7cvIyBee8O3/j98aUZ34ZpenPZFqmaaObWSeL65dg==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0"
+			}
+		},
 		"@kwsites/file-exists": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",
@@ -576,6 +896,47 @@
 			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
 			"dev": true
 		},
+		"@types/babel__core": {
+			"version": "7.1.14",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
+			"integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
+			"dev": true,
+			"requires": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
+			}
+		},
+		"@types/babel__generator": {
+			"version": "7.6.2",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+			"integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@types/babel__template": {
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
+			"integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
+			"dev": true,
+			"requires": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"@types/babel__traverse": {
+			"version": "7.11.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
+			"integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "^7.3.0"
+			}
+		},
 		"@types/cacheable-request": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz",
@@ -603,12 +964,51 @@
 			"resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz",
 			"integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="
 		},
+		"@types/graceful-fs": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+			"integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@types/http-cache-semantics": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz",
 			"integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==",
 			"dev": true
 		},
+		"@types/istanbul-lib-coverage": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+			"dev": true
+		},
+		"@types/istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-coverage": "*"
+			}
+		},
+		"@types/istanbul-reports": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+			"integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-report": "*"
+			}
+		},
+		"@types/json-schema": {
+			"version": "7.0.7",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+			"integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+			"dev": true
+		},
 		"@types/keyv": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
@@ -656,6 +1056,12 @@
 			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
 			"dev": true
 		},
+		"@types/prettier": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.0.tgz",
+			"integrity": "sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw==",
+			"dev": true
+		},
 		"@types/puppeteer": {
 			"version": "5.4.3",
 			"resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.3.tgz",
@@ -683,6 +1089,12 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/stack-utils": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+			"integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+			"dev": true
+		},
 		"@types/unist": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
@@ -695,6 +1107,21 @@
 			"integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==",
 			"dev": true
 		},
+		"@types/yargs": {
+			"version": "16.0.3",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.3.tgz",
+			"integrity": "sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ==",
+			"dev": true,
+			"requires": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"@types/yargs-parser": {
+			"version": "20.2.0",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+			"integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+			"dev": true
+		},
 		"@types/yauzl": {
 			"version": "2.9.1",
 			"resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
@@ -705,12 +1132,83 @@
 				"@types/node": "*"
 			}
 		},
-		"@ungap/promise-all-settled": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-			"integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+		"@typescript-eslint/experimental-utils": {
+			"version": "4.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz",
+			"integrity": "sha512-sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ==",
+			"dev": true,
+			"requires": {
+				"@types/json-schema": "^7.0.7",
+				"@typescript-eslint/scope-manager": "4.26.1",
+				"@typescript-eslint/types": "4.26.1",
+				"@typescript-eslint/typescript-estree": "4.26.1",
+				"eslint-scope": "^5.1.1",
+				"eslint-utils": "^3.0.0"
+			},
+			"dependencies": {
+				"eslint-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+					"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+					"dev": true,
+					"requires": {
+						"eslint-visitor-keys": "^2.0.0"
+					}
+				}
+			}
+		},
+		"@typescript-eslint/scope-manager": {
+			"version": "4.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz",
+			"integrity": "sha512-TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "4.26.1",
+				"@typescript-eslint/visitor-keys": "4.26.1"
+			}
+		},
+		"@typescript-eslint/types": {
+			"version": "4.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz",
+			"integrity": "sha512-STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg==",
 			"dev": true
 		},
+		"@typescript-eslint/typescript-estree": {
+			"version": "4.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz",
+			"integrity": "sha512-l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "4.26.1",
+				"@typescript-eslint/visitor-keys": "4.26.1",
+				"debug": "^4.3.1",
+				"globby": "^11.0.3",
+				"is-glob": "^4.0.1",
+				"semver": "^7.3.5",
+				"tsutils": "^3.21.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				}
+			}
+		},
+		"@typescript-eslint/visitor-keys": {
+			"version": "4.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz",
+			"integrity": "sha512-IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/types": "4.26.1",
+				"eslint-visitor-keys": "^2.0.0"
+			}
+		},
 		"@wdio/config": {
 			"version": "6.12.1",
 			"resolved": "https://registry.npmjs.org/@wdio/config/-/config-6.12.1.tgz",
@@ -831,6 +1329,23 @@
 			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
 			"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
 		},
+		"ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dev": true,
+			"requires": {
+				"type-fest": "^0.21.3"
+			},
+			"dependencies": {
+				"type-fest": {
+					"version": "0.21.3",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+					"dev": true
+				}
+			}
+		},
 		"ansi-regex": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -968,12 +1483,6 @@
 			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
 			"dev": true
 		},
-		"assertion-error": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-			"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-			"dev": true
-		},
 		"astral-regex": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -1030,6 +1539,77 @@
 			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
 			"dev": true
 		},
+		"babel-jest": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.0.2.tgz",
+			"integrity": "sha512-9OThPl3/IQbo4Yul2vMz4FYwILPQak8XelX4YGowygfHaOl5R5gfjm4iVx4d8aUugkW683t8aq0A74E7b5DU1Q==",
+			"dev": true,
+			"requires": {
+				"@jest/transform": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.0.0",
+				"babel-preset-jest": "^27.0.1",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"slash": "^3.0.0"
+			}
+		},
+		"babel-plugin-istanbul": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
+			"integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-instrument": "^4.0.0",
+				"test-exclude": "^6.0.0"
+			}
+		},
+		"babel-plugin-jest-hoist": {
+			"version": "27.0.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz",
+			"integrity": "sha512-sqBF0owAcCDBVEDtxqfYr2F36eSHdx7lAVGyYuOBRnKdD6gzcy0I0XrAYCZgOA3CRrLhmR+Uae9nogPzmAtOfQ==",
+			"dev": true,
+			"requires": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.0.0",
+				"@types/babel__traverse": "^7.0.6"
+			}
+		},
+		"babel-preset-current-node-syntax": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+			"dev": true,
+			"requires": {
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-bigint": "^7.8.3",
+				"@babel/plugin-syntax-class-properties": "^7.8.3",
+				"@babel/plugin-syntax-import-meta": "^7.8.3",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-top-level-await": "^7.8.3"
+			}
+		},
+		"babel-preset-jest": {
+			"version": "27.0.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz",
+			"integrity": "sha512-nIBIqCEpuiyhvjQs2mVNwTxQQa2xk70p9Dd/0obQGBf8FBzbnI8QhQKzLsWMN2i6q+5B0OcWDtrboBX5gmOLyA==",
+			"dev": true,
+			"requires": {
+				"babel-plugin-jest-hoist": "^27.0.1",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			}
+		},
 		"bail": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
@@ -1080,12 +1660,6 @@
 				"tweetnacl": "^0.14.3"
 			}
 		},
-		"binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-			"dev": true
-		},
 		"bl": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -1180,12 +1754,6 @@
 			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
 			"dev": true
 		},
-		"browser-stdout": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-			"dev": true
-		},
 		"browserslist": {
 			"version": "4.16.6",
 			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
@@ -1199,6 +1767,15 @@
 				"node-releases": "^1.1.71"
 			}
 		},
+		"bser": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+			"dev": true,
+			"requires": {
+				"node-int64": "^0.4.0"
+			}
+		},
 		"buffer": {
 			"version": "5.7.1",
 			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -1217,8 +1794,7 @@
 		"buffer-from": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-			"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-			"optional": true
+			"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
 		},
 		"bytes": {
 			"version": "3.1.0",
@@ -1320,29 +1896,6 @@
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
 			"dev": true
 		},
-		"chai": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
-			"integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
-			"dev": true,
-			"requires": {
-				"assertion-error": "^1.1.0",
-				"check-error": "^1.0.2",
-				"deep-eql": "^3.0.1",
-				"get-func-name": "^2.0.0",
-				"pathval": "^1.1.1",
-				"type-detect": "^4.0.5"
-			}
-		},
-		"chai-as-promised": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
-			"integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
-			"dev": true,
-			"requires": {
-				"check-error": "^1.0.2"
-			}
-		},
 		"chalk": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
@@ -1352,6 +1905,12 @@
 				"supports-color": "^7.1.0"
 			}
 		},
+		"char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+			"dev": true
+		},
 		"character-entities": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
@@ -1375,28 +1934,6 @@
 			"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
 			"integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
 		},
-		"check-error": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-			"integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-			"dev": true
-		},
-		"chokidar": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-			"integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-			"dev": true,
-			"requires": {
-				"anymatch": "~3.1.1",
-				"braces": "~3.0.2",
-				"fsevents": "~2.3.1",
-				"glob-parent": "~5.1.0",
-				"is-binary-path": "~2.1.0",
-				"is-glob": "~4.0.1",
-				"normalize-path": "~3.0.0",
-				"readdirp": "~3.5.0"
-			}
-		},
 		"chownr": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
@@ -1425,6 +1962,18 @@
 				}
 			}
 		},
+		"ci-info": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+			"integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+			"dev": true
+		},
+		"cjs-module-lexer": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.1.tgz",
+			"integrity": "sha512-jVamGdJPDeuQilKhvVn1h3knuMOZzr8QDnpk+M9aMlCaMkTDd6fBWPhiDqFvFZ07pL0liqabAiuy8SY4jGHeaw==",
+			"dev": true
+		},
 		"clarinet": {
 			"version": "0.12.4",
 			"resolved": "https://registry.npmjs.org/clarinet/-/clarinet-0.12.4.tgz",
@@ -1464,6 +2013,18 @@
 				"mimic-response": "^1.0.0"
 			}
 		},
+		"co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+			"dev": true
+		},
+		"collect-v8-coverage": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+			"dev": true
+		},
 		"color-convert": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1762,12 +2323,6 @@
 				"ms": "2.1.2"
 			}
 		},
-		"decamelize": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-			"dev": true
-		},
 		"decamelize-keys": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
@@ -1806,14 +2361,11 @@
 				"mimic-response": "^1.0.0"
 			}
 		},
-		"deep-eql": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-			"integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-			"dev": true,
-			"requires": {
-				"type-detect": "^4.0.0"
-			}
+		"dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=",
+			"dev": true
 		},
 		"deep-is": {
 			"version": "0.1.3",
@@ -1865,6 +2417,12 @@
 			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
 			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
 		},
+		"detect-newline": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+			"dev": true
+		},
 		"detect-node": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz",
@@ -1906,6 +2464,12 @@
 			"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
 			"dev": true
 		},
+		"diff-sequences": {
+			"version": "27.0.1",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.1.tgz",
+			"integrity": "sha512-XPLijkfJUh/PIBnfkcSHgvD6tlYixmcMAn3osTk6jt+H0v/mgURto1XUiD9DKuGX5NDoVS6dSlA23gd9FUaCFg==",
+			"dev": true
+		},
 		"digest-fetch": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/digest-fetch/-/digest-fetch-1.2.0.tgz",
@@ -2078,6 +2642,12 @@
 			"integrity": "sha512-dw7WmrSu/JwtACiBzth8cuKf62NKL1xVJuNvyOg0jvruN/n4NLtGYoTzciQquCPNaS2eR+BT5GrxHbslfc/w1w==",
 			"dev": true
 		},
+		"emittery": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+			"integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+			"dev": true
+		},
 		"emoji-regex": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -2296,6 +2866,15 @@
 			"integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
 			"dev": true
 		},
+		"eslint-plugin-jest": {
+			"version": "24.3.6",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz",
+			"integrity": "sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==",
+			"dev": true,
+			"requires": {
+				"@typescript-eslint/experimental-utils": "^4.0.1"
+			}
+		},
 		"eslint-plugin-jsdoc": {
 			"version": "35.0.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.0.0.tgz",
@@ -2466,12 +3045,40 @@
 				"clone-regexp": "^2.1.0"
 			}
 		},
+		"exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true
+		},
 		"exit-on-epipe": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
 			"integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
 			"dev": true
 		},
+		"expect": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-27.0.2.tgz",
+			"integrity": "sha512-YJFNJe2+P2DqH+ZrXy+ydRQYO87oxRUonZImpDodR1G7qo3NYd3pL+NQ9Keqpez3cehczYwZDBC3A7xk3n7M/w==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"ansi-styles": "^5.0.0",
+				"jest-get-type": "^27.0.1",
+				"jest-matcher-utils": "^27.0.2",
+				"jest-message-util": "^27.0.2",
+				"jest-regex-util": "^27.0.1"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+					"dev": true
+				}
+			}
+		},
 		"express": {
 			"version": "4.17.1",
 			"resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
@@ -2635,6 +3242,15 @@
 				"reusify": "^1.0.4"
 			}
 		},
+		"fb-watchman": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+			"integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+			"dev": true,
+			"requires": {
+				"bser": "2.1.1"
+			}
+		},
 		"fd-slicer": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -2757,22 +3373,6 @@
 				}
 			}
 		},
-		"find-up": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-			"dev": true,
-			"requires": {
-				"locate-path": "^6.0.0",
-				"path-exists": "^4.0.0"
-			}
-		},
-		"flat": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-			"dev": true
-		},
 		"flat-cache": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -2881,12 +3481,6 @@
 			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 			"dev": true
 		},
-		"get-func-name": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-			"integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-			"dev": true
-		},
 		"get-package-type": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
@@ -3102,12 +3696,6 @@
 			"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
 			"dev": true
 		},
-		"growl": {
-			"version": "1.10.5",
-			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-			"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-			"dev": true
-		},
 		"har-schema": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -3162,12 +3750,6 @@
 				}
 			}
 		},
-		"he": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-			"dev": true
-		},
 		"helmet": {
 			"version": "4.6.0",
 			"resolved": "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz",
@@ -3353,6 +3935,16 @@
 			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
 			"dev": true
 		},
+		"import-local": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+			"integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+			"dev": true,
+			"requires": {
+				"pkg-dir": "^4.2.0",
+				"resolve-cwd": "^3.0.0"
+			}
+		},
 		"imurmurhash": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -3420,21 +4012,21 @@
 			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
 			"dev": true
 		},
-		"is-binary-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-			"dev": true,
-			"requires": {
-				"binary-extensions": "^2.0.0"
-			}
-		},
 		"is-buffer": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
 			"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
 			"dev": true
 		},
+		"is-ci": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+			"integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+			"dev": true,
+			"requires": {
+				"ci-info": "^3.1.1"
+			}
+		},
 		"is-core-module": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz",
@@ -3466,6 +4058,12 @@
 			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
 			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
 		},
+		"is-generator-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+			"dev": true
+		},
 		"is-glob": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
@@ -3635,6 +4233,610 @@
 				"istanbul-lib-report": "^3.0.0"
 			}
 		},
+		"jest": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-27.0.4.tgz",
+			"integrity": "sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA==",
+			"dev": true,
+			"requires": {
+				"@jest/core": "^27.0.4",
+				"import-local": "^3.0.2",
+				"jest-cli": "^27.0.4"
+			},
+			"dependencies": {
+				"jest-cli": {
+					"version": "27.0.4",
+					"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.4.tgz",
+					"integrity": "sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ==",
+					"dev": true,
+					"requires": {
+						"@jest/core": "^27.0.4",
+						"@jest/test-result": "^27.0.2",
+						"@jest/types": "^27.0.2",
+						"chalk": "^4.0.0",
+						"exit": "^0.1.2",
+						"graceful-fs": "^4.2.4",
+						"import-local": "^3.0.2",
+						"jest-config": "^27.0.4",
+						"jest-util": "^27.0.2",
+						"jest-validate": "^27.0.2",
+						"prompts": "^2.0.1",
+						"yargs": "^16.0.3"
+					}
+				}
+			}
+		},
+		"jest-changed-files": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.0.2.tgz",
+			"integrity": "sha512-eMeb1Pn7w7x3wue5/vF73LPCJ7DKQuC9wQUR5ebP9hDPpk5hzcT/3Hmz3Q5BOFpR3tgbmaWhJcMTVgC8Z1NuMw==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"execa": "^5.0.0",
+				"throat": "^6.0.1"
+			},
+			"dependencies": {
+				"execa": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+					"dev": true,
+					"requires": {
+						"cross-spawn": "^7.0.3",
+						"get-stream": "^6.0.0",
+						"human-signals": "^2.1.0",
+						"is-stream": "^2.0.0",
+						"merge-stream": "^2.0.0",
+						"npm-run-path": "^4.0.1",
+						"onetime": "^5.1.2",
+						"signal-exit": "^3.0.3",
+						"strip-final-newline": "^2.0.0"
+					}
+				},
+				"get-stream": {
+					"version": "6.0.1",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+					"dev": true
+				},
+				"human-signals": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+					"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+					"dev": true
+				}
+			}
+		},
+		"jest-circus": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.4.tgz",
+			"integrity": "sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.0.3",
+				"@jest/test-result": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"dedent": "^0.7.0",
+				"expect": "^27.0.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.0.2",
+				"jest-matcher-utils": "^27.0.2",
+				"jest-message-util": "^27.0.2",
+				"jest-runtime": "^27.0.4",
+				"jest-snapshot": "^27.0.4",
+				"jest-util": "^27.0.2",
+				"pretty-format": "^27.0.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-config": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.4.tgz",
+			"integrity": "sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.1.0",
+				"@jest/test-sequencer": "^27.0.4",
+				"@jest/types": "^27.0.2",
+				"babel-jest": "^27.0.2",
+				"chalk": "^4.0.0",
+				"deepmerge": "^4.2.2",
+				"glob": "^7.1.1",
+				"graceful-fs": "^4.2.4",
+				"is-ci": "^3.0.0",
+				"jest-circus": "^27.0.4",
+				"jest-environment-jsdom": "^27.0.3",
+				"jest-environment-node": "^27.0.3",
+				"jest-get-type": "^27.0.1",
+				"jest-jasmine2": "^27.0.4",
+				"jest-regex-util": "^27.0.1",
+				"jest-resolve": "^27.0.4",
+				"jest-runner": "^27.0.4",
+				"jest-util": "^27.0.2",
+				"jest-validate": "^27.0.2",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.0.2"
+			}
+		},
+		"jest-diff": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.2.tgz",
+			"integrity": "sha512-BFIdRb0LqfV1hBt8crQmw6gGQHVDhM87SpMIZ45FPYKReZYG5er1+5pIn2zKqvrJp6WNox0ylR8571Iwk2Dmgw==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^27.0.1",
+				"jest-get-type": "^27.0.1",
+				"pretty-format": "^27.0.2"
+			}
+		},
+		"jest-docblock": {
+			"version": "27.0.1",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.0.1.tgz",
+			"integrity": "sha512-TA4+21s3oebURc7VgFV4r7ltdIJ5rtBH1E3Tbovcg7AV+oLfD5DcJ2V2vJ5zFA9sL5CFd/d2D6IpsAeSheEdrA==",
+			"dev": true,
+			"requires": {
+				"detect-newline": "^3.0.0"
+			}
+		},
+		"jest-each": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.0.2.tgz",
+			"integrity": "sha512-OLMBZBZ6JkoXgUenDtseFRWA43wVl2BwmZYIWQws7eS7pqsIvePqj/jJmEnfq91ALk3LNphgwNK/PRFBYi7ITQ==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.0.1",
+				"jest-util": "^27.0.2",
+				"pretty-format": "^27.0.2"
+			}
+		},
+		"jest-environment-jsdom": {
+			"version": "27.0.3",
+			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz",
+			"integrity": "sha512-5KLmgv1bhiimpSA8oGTnZYk6g4fsNyZiA/6gI2tAZUgrufd7heRUSVh4gRokzZVEj8zlwAQYT0Zs6tuJSW/ECA==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.0.3",
+				"@jest/fake-timers": "^27.0.3",
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"jest-mock": "^27.0.3",
+				"jest-util": "^27.0.2",
+				"jsdom": "^16.6.0"
+			}
+		},
+		"jest-environment-node": {
+			"version": "27.0.3",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.0.3.tgz",
+			"integrity": "sha512-co2/IVnIFL3cItpFULCvXFg9us4gvWXgs7mutAMPCbFhcqh56QAOdKhNzC2+RycsC/k4mbMj1VF+9F/NzA0ROg==",
+			"dev": true,
+			"requires": {
+				"@jest/environment": "^27.0.3",
+				"@jest/fake-timers": "^27.0.3",
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"jest-mock": "^27.0.3",
+				"jest-util": "^27.0.2"
+			}
+		},
+		"jest-get-type": {
+			"version": "27.0.1",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.1.tgz",
+			"integrity": "sha512-9Tggo9zZbu0sHKebiAijyt1NM77Z0uO4tuWOxUCujAiSeXv30Vb5D4xVF4UR4YWNapcftj+PbByU54lKD7/xMg==",
+			"dev": true
+		},
+		"jest-haste-map": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.0.2.tgz",
+			"integrity": "sha512-37gYfrYjjhEfk37C4bCMWAC0oPBxDpG0qpl8lYg8BT//wf353YT/fzgA7+Dq0EtM7rPFS3JEcMsxdtDwNMi2cA==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"@types/graceful-fs": "^4.1.2",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"fsevents": "^2.3.2",
+				"graceful-fs": "^4.2.4",
+				"jest-regex-util": "^27.0.1",
+				"jest-serializer": "^27.0.1",
+				"jest-util": "^27.0.2",
+				"jest-worker": "^27.0.2",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.7"
+			}
+		},
+		"jest-jasmine2": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz",
+			"integrity": "sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA==",
+			"dev": true,
+			"requires": {
+				"@babel/traverse": "^7.1.0",
+				"@jest/environment": "^27.0.3",
+				"@jest/source-map": "^27.0.1",
+				"@jest/test-result": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"expect": "^27.0.2",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^27.0.2",
+				"jest-matcher-utils": "^27.0.2",
+				"jest-message-util": "^27.0.2",
+				"jest-runtime": "^27.0.4",
+				"jest-snapshot": "^27.0.4",
+				"jest-util": "^27.0.2",
+				"pretty-format": "^27.0.2",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-leak-detector": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz",
+			"integrity": "sha512-TZA3DmCOfe8YZFIMD1GxFqXUkQnIoOGQyy4hFCA2mlHtnAaf+FeOMxi0fZmfB41ZL+QbFG6BVaZF5IeFIVy53Q==",
+			"dev": true,
+			"requires": {
+				"jest-get-type": "^27.0.1",
+				"pretty-format": "^27.0.2"
+			}
+		},
+		"jest-matcher-utils": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz",
+			"integrity": "sha512-Qczi5xnTNjkhcIB0Yy75Txt+Ez51xdhOxsukN7awzq2auZQGPHcQrJ623PZj0ECDEMOk2soxWx05EXdXGd1CbA==",
+			"dev": true,
+			"requires": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^27.0.2",
+				"jest-get-type": "^27.0.1",
+				"pretty-format": "^27.0.2"
+			}
+		},
+		"jest-message-util": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.2.tgz",
+			"integrity": "sha512-rTqWUX42ec2LdMkoUPOzrEd1Tcm+R1KfLOmFK+OVNo4MnLsEaxO5zPDb2BbdSmthdM/IfXxOZU60P/WbWF8BTw==",
+			"dev": true,
+			"requires": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^27.0.2",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^27.0.2",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"dependencies": {
+				"@babel/code-frame": {
+					"version": "7.14.5",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+					"integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+					"dev": true,
+					"requires": {
+						"@babel/highlight": "^7.14.5"
+					}
+				},
+				"@babel/helper-validator-identifier": {
+					"version": "7.14.5",
+					"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
+					"integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==",
+					"dev": true
+				},
+				"@babel/highlight": {
+					"version": "7.14.5",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+					"integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+					"dev": true,
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.14.5",
+						"chalk": "^2.0.0",
+						"js-tokens": "^4.0.0"
+					},
+					"dependencies": {
+						"chalk": {
+							"version": "2.4.2",
+							"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+							"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+							"dev": true,
+							"requires": {
+								"ansi-styles": "^3.2.1",
+								"escape-string-regexp": "^1.0.5",
+								"supports-color": "^5.3.0"
+							}
+						}
+					}
+				},
+				"ansi-styles": {
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^1.9.0"
+					}
+				},
+				"color-convert": {
+					"version": "1.9.3",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+					"dev": true,
+					"requires": {
+						"color-name": "1.1.3"
+					}
+				},
+				"color-name": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+					"dev": true
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+					"dev": true
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				}
+			}
+		},
+		"jest-mock": {
+			"version": "27.0.3",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.0.3.tgz",
+			"integrity": "sha512-O5FZn5XDzEp+Xg28mUz4ovVcdwBBPfAhW9+zJLO0Efn2qNbYcDaJvSlRiQ6BCZUCVOJjALicuJQI9mRFjv1o9Q==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"@types/node": "*"
+			}
+		},
+		"jest-pnp-resolver": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+			"dev": true
+		},
+		"jest-regex-util": {
+			"version": "27.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.1.tgz",
+			"integrity": "sha512-6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ==",
+			"dev": true
+		},
+		"jest-resolve": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.4.tgz",
+			"integrity": "sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"chalk": "^4.0.0",
+				"escalade": "^3.1.1",
+				"graceful-fs": "^4.2.4",
+				"jest-pnp-resolver": "^1.2.2",
+				"jest-util": "^27.0.2",
+				"jest-validate": "^27.0.2",
+				"resolve": "^1.20.0",
+				"slash": "^3.0.0"
+			}
+		},
+		"jest-resolve-dependencies": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz",
+			"integrity": "sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"jest-regex-util": "^27.0.1",
+				"jest-snapshot": "^27.0.4"
+			}
+		},
+		"jest-runner": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.4.tgz",
+			"integrity": "sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.0.2",
+				"@jest/environment": "^27.0.3",
+				"@jest/test-result": "^27.0.2",
+				"@jest/transform": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"emittery": "^0.8.1",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.4",
+				"jest-docblock": "^27.0.1",
+				"jest-environment-jsdom": "^27.0.3",
+				"jest-environment-node": "^27.0.3",
+				"jest-haste-map": "^27.0.2",
+				"jest-leak-detector": "^27.0.2",
+				"jest-message-util": "^27.0.2",
+				"jest-resolve": "^27.0.4",
+				"jest-runtime": "^27.0.4",
+				"jest-util": "^27.0.2",
+				"jest-worker": "^27.0.2",
+				"source-map-support": "^0.5.6",
+				"throat": "^6.0.1"
+			}
+		},
+		"jest-runtime": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.4.tgz",
+			"integrity": "sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A==",
+			"dev": true,
+			"requires": {
+				"@jest/console": "^27.0.2",
+				"@jest/environment": "^27.0.3",
+				"@jest/fake-timers": "^27.0.3",
+				"@jest/globals": "^27.0.3",
+				"@jest/source-map": "^27.0.1",
+				"@jest/test-result": "^27.0.2",
+				"@jest/transform": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"@types/yargs": "^16.0.0",
+				"chalk": "^4.0.0",
+				"cjs-module-lexer": "^1.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.4",
+				"jest-haste-map": "^27.0.2",
+				"jest-message-util": "^27.0.2",
+				"jest-mock": "^27.0.3",
+				"jest-regex-util": "^27.0.1",
+				"jest-resolve": "^27.0.4",
+				"jest-snapshot": "^27.0.4",
+				"jest-util": "^27.0.2",
+				"jest-validate": "^27.0.2",
+				"slash": "^3.0.0",
+				"strip-bom": "^4.0.0",
+				"yargs": "^16.0.3"
+			}
+		},
+		"jest-serializer": {
+			"version": "27.0.1",
+			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.0.1.tgz",
+			"integrity": "sha512-svy//5IH6bfQvAbkAEg1s7xhhgHTtXu0li0I2fdKHDsLP2P2MOiscPQIENQep8oU2g2B3jqLyxKKzotZOz4CwQ==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"graceful-fs": "^4.2.4"
+			}
+		},
+		"jest-snapshot": {
+			"version": "27.0.4",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.4.tgz",
+			"integrity": "sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA==",
+			"dev": true,
+			"requires": {
+				"@babel/core": "^7.7.2",
+				"@babel/generator": "^7.7.2",
+				"@babel/parser": "^7.7.2",
+				"@babel/plugin-syntax-typescript": "^7.7.2",
+				"@babel/traverse": "^7.7.2",
+				"@babel/types": "^7.0.0",
+				"@jest/transform": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"@types/babel__traverse": "^7.0.4",
+				"@types/prettier": "^2.1.5",
+				"babel-preset-current-node-syntax": "^1.0.0",
+				"chalk": "^4.0.0",
+				"expect": "^27.0.2",
+				"graceful-fs": "^4.2.4",
+				"jest-diff": "^27.0.2",
+				"jest-get-type": "^27.0.1",
+				"jest-haste-map": "^27.0.2",
+				"jest-matcher-utils": "^27.0.2",
+				"jest-message-util": "^27.0.2",
+				"jest-resolve": "^27.0.4",
+				"jest-util": "^27.0.2",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^27.0.2",
+				"semver": "^7.3.2"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				}
+			}
+		},
+		"jest-util": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.0.2.tgz",
+			"integrity": "sha512-1d9uH3a00OFGGWSibpNYr+jojZ6AckOMCXV2Z4K3YXDnzpkAaXQyIpY14FOJPiUmil7CD+A6Qs+lnnh6ctRbIA==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.4",
+				"is-ci": "^3.0.0",
+				"picomatch": "^2.2.3"
+			}
+		},
+		"jest-validate": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.0.2.tgz",
+			"integrity": "sha512-UgBF6/oVu1ofd1XbaSotXKihi8nZhg0Prm8twQ9uCuAfo59vlxCXMPI/RKmrZEVgi3Nd9dS0I8A0wzWU48pOvg==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"camelcase": "^6.2.0",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^27.0.1",
+				"leven": "^3.1.0",
+				"pretty-format": "^27.0.2"
+			}
+		},
+		"jest-watcher": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.0.2.tgz",
+			"integrity": "sha512-8nuf0PGuTxWj/Ytfw5fyvNn/R80iXY8QhIT0ofyImUvdnoaBdT6kob0GmhXR+wO+ALYVnh8bQxN4Tjfez0JgkA==",
+			"dev": true,
+			"requires": {
+				"@jest/test-result": "^27.0.2",
+				"@jest/types": "^27.0.2",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"jest-util": "^27.0.2",
+				"string-length": "^4.0.1"
+			}
+		},
+		"jest-worker": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz",
+			"integrity": "sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg==",
+			"dev": true,
+			"requires": {
+				"@types/node": "*",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"dependencies": {
+				"supports-color": {
+					"version": "8.1.1",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				}
+			}
+		},
 		"js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -3821,6 +5023,12 @@
 			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true
 		},
+		"kleur": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+			"dev": true
+		},
 		"known-css-properties": {
 			"version": "0.21.0",
 			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz",
@@ -3836,6 +5044,12 @@
 				"readable-stream": "^2.0.5"
 			}
 		},
+		"leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true
+		},
 		"levn": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -3878,15 +5092,6 @@
 			"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
 			"dev": true
 		},
-		"locate-path": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-			"dev": true,
-			"requires": {
-				"p-locate": "^5.0.0"
-			}
-		},
 		"lodash": {
 			"version": "4.17.21",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -3960,15 +5165,6 @@
 			"integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=",
 			"dev": true
 		},
-		"log-symbols": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
-			"integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
-			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0"
-			}
-		},
 		"loglevel": {
 			"version": "1.7.1",
 			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
@@ -4015,6 +5211,15 @@
 				"semver": "^6.0.0"
 			}
 		},
+		"makeerror": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+			"integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+			"dev": true,
+			"requires": {
+				"tmpl": "1.0.x"
+			}
+		},
 		"map-obj": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
@@ -4260,89 +5465,6 @@
 			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
 			"dev": true
 		},
-		"mocha": {
-			"version": "8.4.0",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
-			"integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
-			"dev": true,
-			"requires": {
-				"@ungap/promise-all-settled": "1.1.2",
-				"ansi-colors": "4.1.1",
-				"browser-stdout": "1.3.1",
-				"chokidar": "3.5.1",
-				"debug": "4.3.1",
-				"diff": "5.0.0",
-				"escape-string-regexp": "4.0.0",
-				"find-up": "5.0.0",
-				"glob": "7.1.6",
-				"growl": "1.10.5",
-				"he": "1.2.0",
-				"js-yaml": "4.0.0",
-				"log-symbols": "4.0.0",
-				"minimatch": "3.0.4",
-				"ms": "2.1.3",
-				"nanoid": "3.1.20",
-				"serialize-javascript": "5.0.1",
-				"strip-json-comments": "3.1.1",
-				"supports-color": "8.1.1",
-				"which": "2.0.2",
-				"wide-align": "1.1.3",
-				"workerpool": "6.1.0",
-				"yargs": "16.2.0",
-				"yargs-parser": "20.2.4",
-				"yargs-unparser": "2.0.0"
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"js-yaml": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
-					"integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-					"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"mocha-each": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/mocha-each/-/mocha-each-2.0.1.tgz",
-			"integrity": "sha512-0ZgWY5ajbnROXkfyaDb+0RAYzDBH3QVow/1zJiyl7lYMRnj1Nid8RDP2+/2TTajB5n4vr21v35MjB72GjFFj2g==",
-			"dev": true,
-			"requires": {
-				"sprintf-js": "^1.0.3"
-			}
-		},
-		"mocha-logger": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/mocha-logger/-/mocha-logger-1.0.7.tgz",
-			"integrity": "sha512-aujkeHhu8tTQ623GIFrcUEX9XQgoewu1fgxqQEGaYVWOwOZX3tF25+RIfcUTQ9eB2zuulTfGsavlryCDaRsP0w==",
-			"dev": true,
-			"requires": {
-				"mocha": "^8.1.3"
-			}
-		},
 		"module-alias": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz",
@@ -4385,12 +5507,6 @@
 				"minimatch": "^3.0.4"
 			}
 		},
-		"nanoid": {
-			"version": "3.1.20",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
-			"integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
-			"dev": true
-		},
 		"natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -4447,6 +5563,18 @@
 				"uuid": "^8.3.1"
 			}
 		},
+		"node-int64": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+			"integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+			"dev": true
+		},
+		"node-modules-regexp": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
+			"integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+			"dev": true
+		},
 		"node-preload": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
@@ -4748,23 +5876,11 @@
 			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
 			"integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
 		},
-		"p-limit": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-			"dev": true,
-			"requires": {
-				"yocto-queue": "^0.1.0"
-			}
-		},
-		"p-locate": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-			"dev": true,
-			"requires": {
-				"p-limit": "^3.0.2"
-			}
+		"p-each-series": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+			"integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+			"dev": true
 		},
 		"p-map": {
 			"version": "3.0.0",
@@ -4871,12 +5987,6 @@
 			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
 			"dev": true
 		},
-		"pathval": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-			"integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-			"dev": true
-		},
 		"pend": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -4900,6 +6010,63 @@
 			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
 			"optional": true
 		},
+		"pirates": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+			"integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+			"dev": true,
+			"requires": {
+				"node-modules-regexp": "^1.0.0"
+			}
+		},
+		"pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"requires": {
+				"find-up": "^4.0.0"
+			},
+			"dependencies": {
+				"find-up": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+					"dev": true,
+					"requires": {
+						"locate-path": "^5.0.0",
+						"path-exists": "^4.0.0"
+					}
+				},
+				"locate-path": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+					"dev": true,
+					"requires": {
+						"p-locate": "^4.1.0"
+					}
+				},
+				"p-limit": {
+					"version": "2.3.0",
+					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+					"dev": true,
+					"requires": {
+						"p-try": "^2.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+					"dev": true,
+					"requires": {
+						"p-limit": "^2.2.0"
+					}
+				}
+			}
+		},
 		"postcss": {
 			"version": "7.0.35",
 			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -5085,6 +6252,26 @@
 				"fast-diff": "^1.1.2"
 			}
 		},
+		"pretty-format": {
+			"version": "27.0.2",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.2.tgz",
+			"integrity": "sha512-mXKbbBPnYTG7Yra9qFBtqj+IXcsvxsvOBco3QHxtxTl+hHKq6QdzMZ+q0CtL4ORHZgwGImRr2XZUX2EWzORxig==",
+			"dev": true,
+			"requires": {
+				"@jest/types": "^27.0.2",
+				"ansi-regex": "^5.0.0",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^17.0.1"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+					"dev": true
+				}
+			}
+		},
 		"pretty-quick": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.0.tgz",
@@ -5179,6 +6366,16 @@
 			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
 			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
 		},
+		"prompts": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
+			"integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+			"dev": true,
+			"requires": {
+				"kleur": "^3.0.3",
+				"sisteransi": "^1.0.5"
+			}
+		},
 		"proto-list": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -5326,15 +6523,6 @@
 			"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
 			"dev": true
 		},
-		"randombytes": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "^5.1.0"
-			}
-		},
 		"range-parser": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -5377,6 +6565,12 @@
 				}
 			}
 		},
+		"react-is": {
+			"version": "17.0.2",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+			"dev": true
+		},
 		"read-pkg": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -5500,15 +6694,6 @@
 				"minimatch": "^3.0.4"
 			}
 		},
-		"readdirp": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-			"integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-			"dev": true,
-			"requires": {
-				"picomatch": "^2.2.1"
-			}
-		},
 		"redent": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
@@ -5659,6 +6844,23 @@
 			"integrity": "sha512-8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA==",
 			"dev": true
 		},
+		"resolve-cwd": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+			"dev": true,
+			"requires": {
+				"resolve-from": "^5.0.0"
+			},
+			"dependencies": {
+				"resolve-from": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+					"dev": true
+				}
+			}
+		},
 		"resolve-from": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -5827,15 +7029,6 @@
 				"type-fest": "^0.13.1"
 			}
 		},
-		"serialize-javascript": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-			"integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
-			"dev": true,
-			"requires": {
-				"randombytes": "^2.1.0"
-			}
-		},
 		"serve-static": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
@@ -5901,6 +7094,12 @@
 				"supports-color": "^7.2.0"
 			}
 		},
+		"sisteransi": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+			"dev": true
+		},
 		"slash": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -5954,6 +7153,16 @@
 			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true
 		},
+		"source-map-support": {
+			"version": "0.5.19",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+			"integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+			"dev": true,
+			"requires": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
 		"spawn-wrap": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
@@ -6031,7 +7240,8 @@
 		"sprintf-js": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-			"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
+			"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+			"optional": true
 		},
 		"sshpk": {
 			"version": "1.16.1",
@@ -6050,11 +7260,38 @@
 				"tweetnacl": "~0.14.0"
 			}
 		},
+		"stack-utils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+			"integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+			"dev": true,
+			"requires": {
+				"escape-string-regexp": "^2.0.0"
+			},
+			"dependencies": {
+				"escape-string-regexp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+					"dev": true
+				}
+			}
+		},
 		"statuses": {
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
 			"integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
 		},
+		"string-length": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+			"dev": true,
+			"requires": {
+				"char-regex": "^1.0.2",
+				"strip-ansi": "^6.0.0"
+			}
+		},
 		"string-width": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
@@ -6254,6 +7491,16 @@
 				"has-flag": "^4.0.0"
 			}
 		},
+		"supports-hyperlinks": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+			"integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+			"dev": true,
+			"requires": {
+				"has-flag": "^4.0.0",
+				"supports-color": "^7.0.0"
+			}
+		},
 		"svg-tags": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
@@ -6336,6 +7583,16 @@
 				}
 			}
 		},
+		"terminal-link": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+			"dev": true,
+			"requires": {
+				"ansi-escapes": "^4.2.1",
+				"supports-hyperlinks": "^2.0.0"
+			}
+		},
 		"test-exclude": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -6352,12 +7609,24 @@
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
 			"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
 		},
+		"throat": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
+			"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+			"dev": true
+		},
 		"through": {
 			"version": "2.3.8",
 			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
 			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
 			"dev": true
 		},
+		"tmpl": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+			"integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+			"dev": true
+		},
 		"to-fast-properties": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -6420,6 +7689,15 @@
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
 			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
 		},
+		"tsutils": {
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+			"dev": true,
+			"requires": {
+				"tslib": "^1.8.1"
+			}
+		},
 		"tunnel": {
 			"version": "0.0.6",
 			"resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -6585,6 +7863,25 @@
 			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
 			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
 		},
+		"v8-to-istanbul": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+			"integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
+			"dev": true,
+			"requires": {
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^1.6.0",
+				"source-map": "^0.7.3"
+			},
+			"dependencies": {
+				"source-map": {
+					"version": "0.7.3",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+					"dev": true
+				}
+			}
+		},
 		"validate-npm-package-license": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -6651,6 +7948,15 @@
 				"xml-name-validator": "^3.0.0"
 			}
 		},
+		"walker": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+			"integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+			"dev": true,
+			"requires": {
+				"makeerror": "1.0.x"
+			}
+		},
 		"webdriver": {
 			"version": "6.12.1",
 			"resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.12.1.tgz",
@@ -6915,59 +8221,11 @@
 			"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
 			"dev": true
 		},
-		"wide-align": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-			"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-			"dev": true,
-			"requires": {
-				"string-width": "^1.0.2 || 2"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
-			}
-		},
 		"word-wrap": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
 			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
 		},
-		"workerpool": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
-			"integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
-			"dev": true
-		},
 		"wrap-ansi": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -7051,18 +8309,6 @@
 			"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
 			"dev": true
 		},
-		"yargs-unparser": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-			"dev": true,
-			"requires": {
-				"camelcase": "^6.0.0",
-				"decamelize": "^4.0.0",
-				"flat": "^5.0.2",
-				"is-plain-obj": "^2.1.0"
-			}
-		},
 		"yauzl": {
 			"version": "2.10.0",
 			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
@@ -7072,12 +8318,6 @@
 				"fd-slicer": "~1.1.0"
 			}
 		},
-		"yocto-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-			"dev": true
-		},
 		"zip-stream": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz",

From d2fde2bfc80efab1fa984e00516c0faf40541533 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Sat, 12 Jun 2021 23:40:55 +0200
Subject: [PATCH 17/22] fix segment faults in node16 on ubuntu

---
 .github/workflows/node-ci.js.yml | 2 +-
 package.json                     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/node-ci.js.yml b/.github/workflows/node-ci.js.yml
index 3634a728..72ce8594 100644
--- a/.github/workflows/node-ci.js.yml
+++ b/.github/workflows/node-ci.js.yml
@@ -28,5 +28,5 @@ jobs:
         npm run test:prettier
         npm run test:js
         npm run test:css
-        npm run test:e2e
         npm run test:unit
+        npm run test:e2e
diff --git a/package.json b/package.json
index dc5c493f..44b4258c 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,10 @@
 		"install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error",
 		"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error",
 		"postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"",
-		"test": "NODE_ENV=test jest --detectOpenHandles --forceExit",
-		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest --detectOpenHandles --forceExit",
-		"test:e2e": "NODE_ENV=test jest --selectProjects e2e --detectOpenHandles --forceExit",
-		"test:unit": "NODE_ENV=test jest --selectProjects unit --detectOpenHandles --forceExit",
+		"test": "NODE_ENV=test jest -i --forceExit",
+		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i --forceExit",
+		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --forceExit",
+		"test:unit": "NODE_ENV=test jest --selectProjects unit -i --forceExit",
 		"test:prettier": "prettier . --check",
 		"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
 		"test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",

From a2083be76b52346d48d0c18ab2502d55035cfe11 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Sun, 13 Jun 2021 23:06:20 +0200
Subject: [PATCH 18/22] test order

---
 package.json               | 10 ++++++----
 tests/e2e/testSequencer.js | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 tests/e2e/testSequencer.js

diff --git a/package.json b/package.json
index 44b4258c..79f0be04 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,10 @@
 		"install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error",
 		"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error",
 		"postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"",
-		"test": "NODE_ENV=test jest -i --forceExit",
-		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i --forceExit",
-		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --forceExit",
-		"test:unit": "NODE_ENV=test jest --selectProjects unit -i --forceExit",
+		"test": "NODE_ENV=test jest -i",
+		"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i",
+		"test:e2e": "NODE_ENV=test jest --selectProjects e2e -i",
+		"test:unit": "NODE_ENV=test jest --selectProjects unit -i",
 		"test:prettier": "prettier . --check",
 		"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
 		"test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
@@ -93,6 +93,7 @@
 	},
 	"jest": {
 		"verbose": true,
+		"testSequencer": "<rootDir>/tests/e2e/testSequencer.js",
 		"projects": [
 			{
 				"displayName": "unit",
@@ -119,6 +120,7 @@
 				],
 				"testPathIgnorePatterns": [
 					"<rootDir>/tests/e2e/modules/mocks",
+					"<rootDir>/tests/e2e/testSequencer.js",
 					"<rootDir>/tests/e2e/global-setup.js"
 				]
 			}
diff --git a/tests/e2e/testSequencer.js b/tests/e2e/testSequencer.js
new file mode 100644
index 00000000..561f92d9
--- /dev/null
+++ b/tests/e2e/testSequencer.js
@@ -0,0 +1,11 @@
+const Sequencer = require("@jest/test-sequencer").default;
+
+class CustomSequencer extends Sequencer {
+	sort(tests) {
+		let copyTests = Array.from(tests);
+		copyTests = copyTests.sort((testA, testB) => (testA.path > testB.path ? -1 : 1));
+		return (copyTests = copyTests.sort((testA, testB) => (testA.path.includes("/modules/") ? 1 : -1)));
+	}
+}
+
+module.exports = CustomSequencer;

From ee23c5f72ccc8e36c5ce6925c7bcd2f68cd7d735 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Mon, 14 Jun 2021 17:02:11 +0200
Subject: [PATCH 19/22] update clock tests, remove testSequencer

---
 package.json                       |  2 --
 tests/e2e/modules/clock_es_spec.js | 25 ++++++++++++-----------
 tests/e2e/modules/clock_spec.js    | 32 ++++++++++++++++--------------
 tests/e2e/testSequencer.js         | 11 ----------
 4 files changed, 30 insertions(+), 40 deletions(-)
 delete mode 100644 tests/e2e/testSequencer.js

diff --git a/package.json b/package.json
index 79f0be04..f2ccdc03 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,6 @@
 	},
 	"jest": {
 		"verbose": true,
-		"testSequencer": "<rootDir>/tests/e2e/testSequencer.js",
 		"projects": [
 			{
 				"displayName": "unit",
@@ -120,7 +119,6 @@
 				],
 				"testPathIgnorePatterns": [
 					"<rootDir>/tests/e2e/modules/mocks",
-					"<rootDir>/tests/e2e/testSequencer.js",
 					"<rootDir>/tests/e2e/global-setup.js"
 				]
 			}
diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index 30c4faa6..63b2aa1a 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -5,6 +5,13 @@ describe("Clock set to spanish language module", function () {
 
 	let app = null;
 
+	testMatch = async function (element, regex) {
+		await app.client.waitUntilWindowLoaded();
+		const elem = await app.client.$(element);
+		const txt = await elem.getText(element);
+		return txt.match(regex);
+	};
+
 	beforeEach(function () {
 		return helpers
 			.startApplication({
@@ -27,14 +34,12 @@ describe("Clock set to spanish language module", function () {
 
 		it("shows date with correct format", async function () {
 			const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
-			const elem = await app.client.$(".clock .date");
-			return elem.getText(".clock .date").toString().match(dateRegex);
+			return testMatch(".clock .date", dateRegex);
 		});
 
 		it("shows time in 24hr format", async function () {
 			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
-			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").toString().match(timeRegex);
+			return testMatch(".clock .time", timeRegex);
 		});
 	});
 
@@ -46,14 +51,12 @@ describe("Clock set to spanish language module", function () {
 
 		it("shows date with correct format", async function () {
 			const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
-			const elem = await app.client.$(".clock .date");
-			return elem.getText(".clock .date").toString().match(dateRegex);
+			return testMatch(".clock .date", dateRegex);
 		});
 
 		it("shows time in 12hr format", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
-			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").toString().match(timeRegex);
+			return testMatch(".clock .time", timeRegex);
 		});
 	});
 
@@ -65,8 +68,7 @@ describe("Clock set to spanish language module", function () {
 
 		it("shows 12hr time with upper case AM/PM", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
-			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").toString().match(timeRegex);
+			return testMatch(".clock .time", timeRegex);
 		});
 	});
 
@@ -78,8 +80,7 @@ describe("Clock set to spanish language module", function () {
 
 		it("shows week with correct format", async function () {
 			const weekRegex = /^Semana [0-9]{1,2}$/;
-			const elem = await app.client.$(".clock .week");
-			elem.getText(".clock .week").toString().match(weekRegex);
+			return testMatch(".clock .week", weekRegex);
 		});
 	});
 });
diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js
index 13ed9191..0cea265b 100644
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -6,6 +6,13 @@ describe("Clock module", function () {
 
 	let app = null;
 
+	testMatch = async function (element, regex) {
+		await app.client.waitUntilWindowLoaded();
+		const elem = await app.client.$(element);
+		const txt = await elem.getText(element);
+		return txt.match(regex);
+	};
+
 	beforeEach(function () {
 		return helpers
 			.startApplication({
@@ -28,14 +35,12 @@ describe("Clock module", function () {
 
 		it("should show the date in the correct format", async function () {
 			const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
-			const elem = await app.client.$(".clock .date");
-			return elem.getText(".clock .date").toString().match(dateRegex);
+			return testMatch(".clock .date", dateRegex);
 		});
 
 		it("should show the time in 24hr format", async function () {
 			const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
-			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").toString().match(timeRegex);
+			return testMatch(".clock .time", timeRegex);
 		});
 	});
 
@@ -47,14 +52,12 @@ describe("Clock module", function () {
 
 		it("should show the date in the correct format", async function () {
 			const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
-			const elem = await app.client.$(".clock .date");
-			return elem.getText(".clock .date").toString().match(dateRegex);
+			return testMatch(".clock .date", dateRegex);
 		});
 
 		it("should show the time in 12hr format", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
-			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").toString().match(timeRegex);
+			return testMatch(".clock .time", timeRegex);
 		});
 	});
 
@@ -66,8 +69,7 @@ describe("Clock module", function () {
 
 		it("should show 12hr time with upper case AM/PM", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
-			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").toString().match(timeRegex);
+			return testMatch(".clock .time", timeRegex);
 		});
 	});
 
@@ -79,8 +81,7 @@ describe("Clock module", function () {
 
 		it("should show 12hr time without seconds am/pm", async function () {
 			const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[ap]m$/;
-			const elem = await app.client.$(".clock .time");
-			return elem.getText(".clock .time").toString().match(timeRegex);
+			return testMatch(".clock .time", timeRegex);
 		});
 	});
 
@@ -92,15 +93,16 @@ describe("Clock module", function () {
 
 		it("should show the week in the correct format", async function () {
 			const weekRegex = /^Week [0-9]{1,2}$/;
-			const elem = await app.client.$(".clock .week");
-			return elem.getText(".clock .week").toString().match(weekRegex);
+			return testMatch(".clock .week", weekRegex);
 		});
 
 		it("should show the week with the correct number of week of year", async function () {
 			const currentWeekNumber = moment().week();
 			const weekToShow = "Week " + currentWeekNumber;
+			await app.client.waitUntilWindowLoaded();
 			const elem = await app.client.$(".clock .week");
-			return elem.getText(".clock .week") === weekToShow;
+			const txt = await elem.getText(".clock .week");
+			return txt === weekToShow;
 		});
 	});
 
diff --git a/tests/e2e/testSequencer.js b/tests/e2e/testSequencer.js
deleted file mode 100644
index 561f92d9..00000000
--- a/tests/e2e/testSequencer.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const Sequencer = require("@jest/test-sequencer").default;
-
-class CustomSequencer extends Sequencer {
-	sort(tests) {
-		let copyTests = Array.from(tests);
-		copyTests = copyTests.sort((testA, testB) => (testA.path > testB.path ? -1 : 1));
-		return (copyTests = copyTests.sort((testA, testB) => (testA.path.includes("/modules/") ? 1 : -1)));
-	}
-}
-
-module.exports = CustomSequencer;

From e3a5bbf661779bd44ade07cd831e008815e33844 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Mon, 14 Jun 2021 21:07:38 +0200
Subject: [PATCH 20/22] use expect where missing

---
 tests/e2e/modules/clock_es_spec.js   | 2 +-
 tests/e2e/modules/clock_spec.js      | 6 +++---
 tests/e2e/modules/helloworld_spec.js | 4 ++--
 tests/e2e/modules_display_spec.js    | 4 ++--
 tests/e2e/modules_position_spec.js   | 4 +++-
 tests/e2e/without_modules.js         | 4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index 63b2aa1a..f97fba2f 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -9,7 +9,7 @@ describe("Clock set to spanish language module", function () {
 		await app.client.waitUntilWindowLoaded();
 		const elem = await app.client.$(element);
 		const txt = await elem.getText(element);
-		return txt.match(regex);
+		return expect(txt).toMatch(regex);
 	};
 
 	beforeEach(function () {
diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js
index 0cea265b..c09f44de 100644
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -10,7 +10,7 @@ describe("Clock module", function () {
 		await app.client.waitUntilWindowLoaded();
 		const elem = await app.client.$(element);
 		const txt = await elem.getText(element);
-		return txt.match(regex);
+		return expect(txt).toMatch(regex);
 	};
 
 	beforeEach(function () {
@@ -102,7 +102,7 @@ describe("Clock module", function () {
 			await app.client.waitUntilWindowLoaded();
 			const elem = await app.client.$(".clock .week");
 			const txt = await elem.getText(".clock .week");
-			return txt === weekToShow;
+			return expect(txt).toBe(weekToShow);
 		});
 	});
 
@@ -113,7 +113,7 @@ describe("Clock module", function () {
 		});
 
 		it("should show the analog clock face", async () => {
-			await app.client.waitUntilWindowLoaded(10000);
+			await app.client.waitUntilWindowLoaded();
 			const clock = await app.client.$$(".clockCircle");
 			return expect(clock.length).toBe(1);
 		});
diff --git a/tests/e2e/modules/helloworld_spec.js b/tests/e2e/modules/helloworld_spec.js
index 49e9f8f3..95ee1a2d 100644
--- a/tests/e2e/modules/helloworld_spec.js
+++ b/tests/e2e/modules/helloworld_spec.js
@@ -27,7 +27,7 @@ describe("Test helloworld module", function () {
 
 		it("Test message helloworld module", async function () {
 			const elem = await app.client.$(".helloworld");
-			return elem.getText(".helloworld") === "Test HelloWorld Module";
+			return expect(await elem.getText(".helloworld")).toBe("Test HelloWorld Module");
 		});
 	});
 
@@ -39,7 +39,7 @@ describe("Test helloworld module", function () {
 
 		it("Test message helloworld module", async function () {
 			const elem = await app.client.$(".helloworld");
-			return elem.getText(".helloworld") === "Hello World!";
+			return expect(await elem.getText(".helloworld")).toBe("Hello World!");
 		});
 	});
 });
diff --git a/tests/e2e/modules_display_spec.js b/tests/e2e/modules_display_spec.js
index 71a1f670..6132c62f 100644
--- a/tests/e2e/modules_display_spec.js
+++ b/tests/e2e/modules_display_spec.js
@@ -27,12 +27,12 @@ describe("Display of modules", function () {
 
 		it("should show the test header", async () => {
 			const elem = await app.client.$("#module_0_helloworld .module-header", 10000);
-			return elem.getText("#module_0_helloworld .module-header") === "TEST_HEADER";
+			return expect(await elem.getText("#module_0_helloworld .module-header")).toBe("TEST_HEADER");
 		});
 
 		it("should show no header if no header text is specified", async () => {
 			const elem = await app.client.$("#module_1_helloworld .module-header", 10000);
-			return elem.getText("#module_1_helloworld .module-header") === false;
+			return expect(await elem.getText("#module_1_helloworld .module-header")).toBe("");
 		});
 	});
 });
diff --git a/tests/e2e/modules_position_spec.js b/tests/e2e/modules_position_spec.js
index 80525afb..7ac1cadd 100644
--- a/tests/e2e/modules_position_spec.js
+++ b/tests/e2e/modules_position_spec.js
@@ -28,7 +28,9 @@ describe("Position of modules", function () {
 			const className = position.replace("_", ".");
 			it("should show text in " + position, function () {
 				return app.client.$("." + className).then((result) => {
-					return result.getText("." + className) === "Text in " + position;
+					return result.getText("." + className).then((text) => {
+						return expect(text).toContain("Text in " + position);
+					});
 				});
 			});
 		}
diff --git a/tests/e2e/without_modules.js b/tests/e2e/without_modules.js
index 499caad0..0214aed7 100644
--- a/tests/e2e/without_modules.js
+++ b/tests/e2e/without_modules.js
@@ -26,11 +26,11 @@ describe("Check configuration without modules", function () {
 
 	it("Show the message MagicMirror title", async function () {
 		const elem = await app.client.$("#module_1_helloworld .module-content");
-		return elem.getText("#module_1_helloworld .module-content") === "Magic Mirror2";
+		return expect(await elem.getText("#module_1_helloworld .module-content")).toBe("Magic Mirror2");
 	});
 
 	it("Show the text Michael's website", async function () {
 		const elem = await app.client.$("#module_5_helloworld .module-content");
-		return elem.getText("#module_5_helloworld .module-content") === "www.michaelteeuw.nl";
+		return expect(await elem.getText("#module_5_helloworld .module-content")).toBe("www.michaelteeuw.nl");
 	});
 });

From 189c01fc74736ff7c63b94fe595335b5538eec30 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Mon, 14 Jun 2021 22:45:21 +0200
Subject: [PATCH 21/22] update moduleNameMapper

---
 package.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.json b/package.json
index f2ccdc03..b7ed1300 100644
--- a/package.json
+++ b/package.json
@@ -106,10 +106,7 @@
 					"<rootDir>/tests/unit/setup_unit.js"
 				],
 				"moduleNameMapper": {
-					"node_helper": "<rootDir>/js/node_helper.js",
-					"logger": "<rootDir>/js/logger.js",
-					"moment-timezone": "<rootDir>/node_modules/moment-timezone/moment-timezone.js",
-					"moment": "<rootDir>/node_modules/moment/moment.js"
+					"logger": "<rootDir>/js/logger.js"
 				}
 			},
 			{

From a71e61cd30264adf759098d58246ddfe6bb42107 Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Tue, 15 Jun 2021 23:29:07 +0200
Subject: [PATCH 22/22] use short if in weatherforecast.js, add comment to
 logger.js

---
 js/logger.js                                     |  1 +
 .../default/weatherforecast/weatherforecast.js   | 16 ++++------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/js/logger.js b/js/logger.js
index 7c802924..18aa9175 100644
--- a/js/logger.js
+++ b/js/logger.js
@@ -35,6 +35,7 @@
 		timeEnd: Function.prototype.bind.call(console.timeEnd, console)
 	};
 
+	// the timeStamp instruction fails when running the tests so it is not added in test environment
 	if (process.env.NODE_ENV.trim() !== "test") {
 		logLevel.push({ timeStamp: Function.prototype.bind.call(console.timeStamp, console) });
 	}
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index 23f50d49..50229262 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -340,12 +340,8 @@ Module.register("weatherforecast", {
 	 * argument data object - Weather information received form openweather.org.
 	 */
 	processWeather: function (data, momenttz) {
-		let mom;
-		if (momenttz === null) {
-			mom = moment;
-		} else {
-			mom = momenttz;
-		}
+		let mom = momenttz ? momenttz : moment; // Exception last.
+
 		// Forcast16 (paid) API endpoint provides this data.  Onecall endpoint
 		// does not.
 		if (data.city) {
@@ -489,12 +485,8 @@ Module.register("weatherforecast", {
 	 * This code finds all forecasts that is for the same day and sums the amount of rain and returns that.
 	 */
 	processRain: function (forecast, allForecasts, momenttz) {
-		let mom;
-		if (momenttz === null) {
-			mom = moment;
-		} else {
-			mom = momenttz;
-		}
+		let mom = momenttz ? momenttz : moment; // Exception last.
+
 		//If the amount of rain actually is a number, return it
 		if (!isNaN(forecast.rain)) {
 			return forecast.rain;