kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-29 12:39:45 +00:00
Code Issues Projects Releases Wiki Activity

run prettier

Browse Source
This commit is contained in:
karsten13 2021-06-11 22:24:21 +02:00
parent 044935a164
commit 1a244726aa
21 changed files with 41 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/logger.js
View File

@ -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) {

12
modules/default/weatherforecast/weatherforecast.js
View File

@ -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;

13
package.json
View File

@ -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"
]
}
]
}

5
tests/e2e/env_spec.js
View File

@ -1,11 +1,6 @@
const helpers = require("./global-setup");
const fetch = require("node-fetch");
describe("Electron app environment", function () {
helpers.setupTimeout(this);

2
tests/e2e/fonts.js
View File

@ -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);

5
tests/e2e/modules/alert_spec.js
View File

@ -1,10 +1,5 @@
const helpers = require("../global-setup");
describe("Alert module", function () {
helpers.setupTimeout(this);

5
tests/e2e/modules/calendar_spec.js
View File

@ -1,11 +1,6 @@
const helpers = require("../global-setup");
const serverBasicAuth = require("../../servers/basic-auth.js");
describe("Calendar module", function () {
helpers.setupTimeout(this);

5
tests/e2e/modules/clock_es_spec.js
View File

@ -1,10 +1,5 @@
const helpers = require("../global-setup");
describe("Clock set to spanish language module", function () {
helpers.setupTimeout(this);

7
tests/e2e/modules/clock_spec.js
View File

@ -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;
});
});

17
tests/e2e/modules/compliments_spec.js
View File

@ -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);
});
});
});

4
tests/e2e/modules/helloworld_spec.js
View File

@ -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!";
});
});
});

5
tests/e2e/modules/newsfeed_spec.js
View File

@ -1,10 +1,5 @@
const helpers = require("../global-setup");
describe("Newsfeed module", function () {
helpers.setupTimeout(this);

7
tests/e2e/modules_display_spec.js
View File

@ -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;
});
});
});

5
tests/e2e/modules_position_spec.js
View File

@ -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;
});
});
}

5
tests/e2e/port_config.js
View File

@ -1,11 +1,6 @@
const helpers = require("./global-setup");
const fetch = require("node-fetch");
describe("port directive configuration", function () {
helpers.setupTimeout(this);

2
tests/e2e/vendor_spec.js
View File

@ -1,8 +1,6 @@
const helpers = require("./global-setup");
const fetch = require("node-fetch");
const before = global.before;
const after = global.after;

9
tests/e2e/without_modules.js
View File

@ -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";
});
});

5
tests/unit/classes/translator_spec.js
View File

@ -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);
}

2
tests/unit/functions/newsfeed_spec.js
View File

@ -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", () => {});
});

3
tests/unit/global_vars/defaults_modules_spec.js
View File

@ -14,8 +14,7 @@ beforeAll(function () {
__dirname: path.dirname(filePath),
global: {},
process: {
on: function () {
},
on: function () {},
env: {}
}
};

3
tests/unit/global_vars/root_path_spec.js
View File

@ -14,8 +14,7 @@ beforeAll(function () {
__dirname: path.dirname(filePath),
global: {},
process: {
on: function () {
},
on: function () {},
env: {}
}
};