Merge branch 'develop' into dev_console_test

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Karsten Hassel 2021-06-23 23:14:19 +02:00
commit 58d2a0d874
5 changed files with 8 additions and 5 deletions

View File

@ -11,6 +11,7 @@ on:
jobs:
run-and-upload-coverage-report:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- run: |

View File

@ -9,6 +9,7 @@ on:
jobs:
check:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: dangoslen/changelog-enforcer@v1.6.1

View File

@ -12,6 +12,7 @@ on:
jobs:
test:
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
matrix:
node-version: [12.x, 14.x, 16.x]

View File

@ -56,7 +56,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 calendar debug check
- Really run prettier over all files
- Fix logger.js after jest changes
- Fix logger.js after jest changes, use --forceExit running jest
- Workaround for dev_console test using getWindowCount.
## [2.15.0] - 2021-04-01

View File

@ -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 -i",
"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",