mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-28 04:02:12 +00:00
## [2.22.0] - 2023-01-01 Thanks to: @angeldeejay, @buxxi, @dariom, @dWoolridge, @KristjanESPERANTO, @MagMar94, @naveensrinivasan, @retroflex, @SkySails and @Tom. Special thanks to @khassel, @rejas and @sdetweil for taking over most (if not all) of the work on this release as project collaborators. This version would not be there without their effort. Thank you! ### Added - Added test for remoteFile option in compliments module - Added hourlyWeather functionality to Weather.gov weather provider - Removed weatherEndpoint definition from weathergov.js (not used) - Added css class names "today" and "tomorrow" for default calendar - Added Collaboration.md - Added new github action for dependency review (#2862) - Added a WeatherProvider for Open-Meteo - Added Yr as a weather provider - Added config options "ignoreXOriginHeader" and "ignoreContentSecurityPolicy" ### Removed - Removed usage of internal fetch function of node until it is more stable ### Updated - Cleaned up test directory (#2937) and jest config (#2959) - Wait for all modules to start before declaring the system ready (#2487) - Updated e2e tests (moved `done()` in helper functions) and use es6 syntax in all tests - Updated da translation - Rework weather module - Make sure smhi provider api only gets a maximum of 6 digits coordinates (#2955) - Use fetch instead of XMLHttpRequest in weatherprovider (#2935) - Reworked how weatherproviders handle units (#2849) - Use unix() method for parsing times, fix suntimes on the way (#2950) - Refactor conversion functions into utils class (#2958) - The `cors`-method in `server.js` now supports sending and recieving HTTP headers - Replace `…` by `…` - Cleanup compliments module - Updated dependencies including electron to v22 (#2903) ### Fixed - Correctly show apparent temperature in SMHI weather provider - Ensure updatenotification module isn't shown when local is _ahead_ of remote - Handle node_helper errors during startup (#2944) - Possibility to change FontAwesome class in calendar, so icons like `fab fa-facebook-square` works. - Fix cors problems with newsfeed articles (as far as possible), allow disabling cors per feed with option `useCorsProxy: false` (#2840) - Tests not waiting for the application to start and stop before starting the next test - Fix electron tests failing sometimes in github workflow - Fixed gap in clock module when displayed on the left side with displayType=digital - Fixed playwright issue by upgrading to v1.29.1 (#2969) Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <michael@veeck.de> Co-authored-by: dWoolridge <dwoolridge@charter.net> Co-authored-by: Johan <jojjepersson@yahoo.se> Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com> Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: buxxi <buxxi@omfilm.net> Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com>
289 lines
9.9 KiB
JavaScript
289 lines
9.9 KiB
JavaScript
const path = require("path");
|
|
const helmet = require("helmet");
|
|
const { JSDOM } = require("jsdom");
|
|
const express = require("express");
|
|
const sockets = new Set();
|
|
|
|
describe("Translator", () => {
|
|
let server;
|
|
|
|
beforeAll(() => {
|
|
const app = express();
|
|
app.use(helmet());
|
|
app.use((req, res, next) => {
|
|
res.header("Access-Control-Allow-Origin", "*");
|
|
next();
|
|
});
|
|
app.use("/translations", express.static(path.join(__dirname, "..", "..", "..", "tests", "mocks")));
|
|
|
|
server = app.listen(3000);
|
|
|
|
server.on("connection", (socket) => {
|
|
sockets.add(socket);
|
|
});
|
|
});
|
|
|
|
afterAll(() => {
|
|
for (const socket of sockets) {
|
|
socket.destroy();
|
|
|
|
sockets.delete(socket);
|
|
}
|
|
|
|
server.close();
|
|
});
|
|
|
|
describe("translate", () => {
|
|
const translations = {
|
|
"MMM-Module": {
|
|
Hello: "Hallo",
|
|
"Hello {username}": "Hallo {username}"
|
|
}
|
|
};
|
|
|
|
const coreTranslations = {
|
|
Hello: "XXX",
|
|
"Hello {username}": "XXX",
|
|
FOO: "Foo",
|
|
"BAR {something}": "Bar {something}"
|
|
};
|
|
|
|
const translationsFallback = {
|
|
"MMM-Module": {
|
|
Hello: "XXX",
|
|
"Hello {username}": "XXX",
|
|
FOO: "XXX",
|
|
"BAR {something}": "XXX",
|
|
"A key": "A translation"
|
|
}
|
|
};
|
|
|
|
const coreTranslationsFallback = {
|
|
FOO: "XXX",
|
|
"BAR {something}": "XXX",
|
|
Hello: "XXX",
|
|
"Hello {username}": "XXX",
|
|
"A key": "XXX",
|
|
Fallback: "core fallback"
|
|
};
|
|
|
|
/**
|
|
* @param {object} Translator the global Translator object
|
|
*/
|
|
const setTranslations = (Translator) => {
|
|
Translator.translations = translations;
|
|
Translator.coreTranslations = coreTranslations;
|
|
Translator.translationsFallback = translationsFallback;
|
|
Translator.coreTranslationsFallback = coreTranslationsFallback;
|
|
};
|
|
|
|
it("should return custom module translation", (done) => {
|
|
const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
let translation = Translator.translate({ name: "MMM-Module" }, "Hello");
|
|
expect(translation).toBe("Hallo");
|
|
translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}", { username: "fewieden" });
|
|
expect(translation).toBe("Hallo fewieden");
|
|
done();
|
|
};
|
|
});
|
|
|
|
it("should return core translation", (done) => {
|
|
const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
let translation = Translator.translate({ name: "MMM-Module" }, "FOO");
|
|
expect(translation).toBe("Foo");
|
|
translation = Translator.translate({ name: "MMM-Module" }, "BAR {something}", { something: "Lorem Ipsum" });
|
|
expect(translation).toBe("Bar Lorem Ipsum");
|
|
done();
|
|
};
|
|
});
|
|
|
|
it("should return custom module translation fallback", (done) => {
|
|
const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
const translation = Translator.translate({ name: "MMM-Module" }, "A key");
|
|
expect(translation).toBe("A translation");
|
|
done();
|
|
};
|
|
});
|
|
|
|
it("should return core translation fallback", (done) => {
|
|
const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
const translation = Translator.translate({ name: "MMM-Module" }, "Fallback");
|
|
expect(translation).toBe("core fallback");
|
|
done();
|
|
};
|
|
});
|
|
|
|
it("should return translation with placeholder for missing variables", (done) => {
|
|
const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
const translation = Translator.translate({ name: "MMM-Module" }, "Hello {username}");
|
|
expect(translation).toBe("Hallo {username}");
|
|
done();
|
|
};
|
|
});
|
|
|
|
it("should return key if no translation was found", (done) => {
|
|
const dom = new JSDOM(`<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
setTranslations(Translator);
|
|
const translation = Translator.translate({ name: "MMM-Module" }, "MISSING");
|
|
expect(translation).toBe("MISSING");
|
|
done();
|
|
};
|
|
});
|
|
});
|
|
|
|
describe("load", () => {
|
|
const mmm = {
|
|
name: "TranslationTest",
|
|
file(file) {
|
|
return `http://localhost:3000/translations/${file}`;
|
|
}
|
|
};
|
|
|
|
it("should load translations", (done) => {
|
|
const dom = new JSDOM(`<script>var Log = {log: () => {}};</script><script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
const file = "translation_test.json";
|
|
|
|
Translator.load(mmm, file, false, () => {
|
|
const json = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", file));
|
|
expect(Translator.translations[mmm.name]).toEqual(json);
|
|
done();
|
|
});
|
|
};
|
|
});
|
|
|
|
it("should load translation fallbacks", (done) => {
|
|
const dom = new JSDOM(`<script>var Log = {log: () => {}};</script><script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
const file = "translation_test.json";
|
|
|
|
Translator.load(mmm, file, true, () => {
|
|
const json = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", file));
|
|
expect(Translator.translationsFallback[mmm.name]).toEqual(json);
|
|
done();
|
|
});
|
|
};
|
|
});
|
|
|
|
it("should not load translations, if module fallback exists", (done) => {
|
|
const dom = new JSDOM(`<script>var Log = {log: () => {}};</script><script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`, { runScripts: "dangerously", resources: "usable" });
|
|
dom.window.onload = () => {
|
|
const { Translator, XMLHttpRequest } = dom.window;
|
|
const file = "translation_test.json";
|
|
|
|
XMLHttpRequest.prototype.send = () => {
|
|
throw "Shouldn't load files";
|
|
};
|
|
|
|
Translator.translationsFallback[mmm.name] = {
|
|
Hello: "Hallo"
|
|
};
|
|
|
|
Translator.load(mmm, file, false, () => {
|
|
expect(Translator.translations[mmm.name]).toBe(undefined);
|
|
expect(Translator.translationsFallback[mmm.name]).toEqual({
|
|
Hello: "Hallo"
|
|
});
|
|
done();
|
|
});
|
|
};
|
|
});
|
|
});
|
|
|
|
describe("loadCoreTranslations", () => {
|
|
it("should load core translations and fallback", (done) => {
|
|
const dom = new JSDOM(
|
|
`<script>var translations = {en: "http://localhost:3000/translations/translation_test.json"}; var Log = {log: () => {}};</script>\
|
|
<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`,
|
|
{ runScripts: "dangerously", resources: "usable" }
|
|
);
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
Translator.loadCoreTranslations("en");
|
|
|
|
const en = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"));
|
|
setTimeout(() => {
|
|
expect(Translator.coreTranslations).toEqual(en);
|
|
expect(Translator.coreTranslationsFallback).toEqual(en);
|
|
done();
|
|
}, 500);
|
|
};
|
|
});
|
|
|
|
it("should load core fallback if language cannot be found", (done) => {
|
|
const dom = new JSDOM(
|
|
`<script>var translations = {en: "http://localhost:3000/translations/translation_test.json"}; var Log = {log: () => {}};</script>\
|
|
<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`,
|
|
{ runScripts: "dangerously", resources: "usable" }
|
|
);
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
Translator.loadCoreTranslations("MISSINGLANG");
|
|
|
|
const en = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"));
|
|
setTimeout(() => {
|
|
expect(Translator.coreTranslations).toEqual({});
|
|
expect(Translator.coreTranslationsFallback).toEqual(en);
|
|
done();
|
|
}, 500);
|
|
};
|
|
});
|
|
});
|
|
|
|
describe("loadCoreTranslationsFallback", () => {
|
|
it("should load core translations fallback", (done) => {
|
|
const dom = new JSDOM(
|
|
`<script>var translations = {en: "http://localhost:3000/translations/translation_test.json"}; var Log = {log: () => {}};</script>\
|
|
<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`,
|
|
{ runScripts: "dangerously", resources: "usable" }
|
|
);
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
Translator.loadCoreTranslationsFallback();
|
|
|
|
const en = require(path.join(__dirname, "..", "..", "..", "tests", "mocks", "translation_test.json"));
|
|
setTimeout(() => {
|
|
expect(Translator.coreTranslationsFallback).toEqual(en);
|
|
done();
|
|
}, 500);
|
|
};
|
|
});
|
|
|
|
it("should load core fallback if language cannot be found", (done) => {
|
|
const dom = new JSDOM(
|
|
`<script>var translations = {}; var Log = {log: () => {}};</script>\
|
|
<script src="file://${path.join(__dirname, "..", "..", "..", "js", "translator.js")}">`,
|
|
{ runScripts: "dangerously", resources: "usable" }
|
|
);
|
|
dom.window.onload = () => {
|
|
const { Translator } = dom.window;
|
|
Translator.loadCoreTranslations();
|
|
|
|
setTimeout(() => {
|
|
expect(Translator.coreTranslationsFallback).toEqual({});
|
|
done();
|
|
}, 500);
|
|
};
|
|
});
|
|
});
|
|
});
|