From 1a244726aa8ddbf4f2642f3eb9da84564e3bfc61 Mon Sep 17 00:00:00 2001 From: karsten13 Date: Fri, 11 Jun 2021 22:24:21 +0200 Subject: [PATCH] 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": "/js/node_helper.js", "logger": "/js/logger.js", @@ -105,8 +107,13 @@ }, { "displayName": "e2e", - "testMatch": ["**/tests/e2e/**/*.[jt]s?(x)"], - "testPathIgnorePatterns": ["/tests/e2e/modules/mocks", "/tests/e2e/global-setup.js"] + "testMatch": [ + "**/tests/e2e/**/*.[jt]s?(x)" + ], + "testPathIgnorePatterns": [ + "/tests/e2e/modules/mocks", + "/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: {} } };