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

Merge pull request #2599 from khassel/jest

Browse Source
This commit is contained in:
Michael Teeuw 2021-06-17 07:06:36 +02:00 committed by GitHub
commit cbe7b1a5b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -55,6 +55,7 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel,
- Fix config check failing when encountering let syntax ("Parsing error: Unexpected token config") - Fix config check failing when encountering let syntax ("Parsing error: Unexpected token config")
- Fix calendar debug check - Fix calendar debug check
- Really run prettier over all files - Really run prettier over all files
- Fix logger.js after jest changes
## [2.15.0] - 2021-04-01 ## [2.15.0] - 2021-04-01

4
js/logger.js
View File

@ -36,8 +36,8 @@
}; };
// the timeStamp instruction fails when running the tests so it is not added in test environment // the timeStamp instruction fails when running the tests so it is not added in test environment
if (process.env.NODE_ENV.trim() !== "test") { if (typeof process === "object" && process.env.NODE_ENV.trim() !== "test") {
logLevel.push({ timeStamp: Function.prototype.bind.call(console.timeStamp, console) }); logLevel = Object.assign(logLevel, { timeStamp: Function.prototype.bind.call(console.timeStamp, console) });
} }
logLevel.setLogLevel = function (newLevel) { logLevel.setLogLevel = function (newLevel) {