Skip to content

Commit

Permalink
test: Fix reporting coverage
Browse files Browse the repository at this point in the history
The coverage of the tests was being reported.
  • Loading branch information
manthey committed Nov 6, 2023
1 parent 7408134 commit 404f1f2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
4 changes: 0 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ repos:
- "hist,indext,pixelx,thex,hight,reenable,lastr,xdescribe,afterall,countr"
- --skip
- examples/sld/index.pug,package-lock.json,examples/reprojection/proj.json,website/themes/agency/source/vendor/jquery/jquery.min.js,examples/reprojection/capitals.json
- repo: https://github.com/syntaqx/git-hooks
rev: v0.0.18
hooks:
- id: circleci-config-validate
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
rev: v9.5.0
hooks:
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"lint": "eslint --cache . --max-warnings=0",
"format": "eslint --cache --fix . && stylelint **/*.styl --fix",
"puglint": "pug-lint src examples",
"styllint": "stylelint **/*.styl",
"stylelint": "stylelint **/*.styl",
"glsllint": "chmod +x node_modules/glslang-validator-prebuilt-predownloaded/bin/glslangValidator.linux; find . \\( -name '*.frag' \\) -exec sh -c 'for n; do python scripts/preprocess_glsl.py \"$n\" | node_modules/glslang-validator-prebuilt-predownloaded/bin/glslangValidator.linux --stdin -S frag || exit 1; done' sh {} \\+ && find . \\( -name '*.vert' \\) -exec sh -c 'for n; do python scripts/preprocess_glsl.py \"$n\" | node_modules/glslang-validator-prebuilt-predownloaded/bin/glslangValidator.linux --stdin -S vert || exit 1; done' sh {} \\+",
"test-headless": "GEOJS_TEST_CASE=tests/test-unit.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch",
"test-headless-all": "GEOJS_TEST_CASE=tests/test-unit.js karma start karma-cov.conf.js --single-run --browsers ChromeHeadlessTouch,FirefoxHeadlessTouch",
Expand All @@ -152,7 +152,7 @@
"get-data-files": "node scripts/datastore.js dist/data",
"ci-clean": "git clean -fxd dist -e dist/data jsdoc/tmpl jsdoc/static images lcov",
"ci": "npm-run-all ci-build ci-test",
"ci-build": "npm-run-all -c -p build-full build-lean docs get-data-files lint puglint glsllint styllint build-examples build-tutorials",
"ci-build": "npm-run-all -c -p build-full build-lean docs get-data-files lint puglint glsllint stylelint build-examples build-tutorials",
"ci-test": "npm-run-all test-headless test-webglheadless test-headed test-tutorials",
"ci-xvfb": "npm-run-all ci-clean ci-build && TEST_SAVE_IMAGE='all' xvfb-run -s '-ac -screen 0 1280x1024x24' npm run ci-test",
"start": "karma start karma.conf.js",
Expand Down
10 changes: 6 additions & 4 deletions webpack.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ module.exports = {
module: {
rules: [{
test: /\.js$/,
// include: path.resolve('src'),
include: [
path.resolve('src'),
path.resolve('examples'),
path.resolve('tutorials')
],
exclude: /node_modules\/(?!kdbush\/).*/,
use: [{
loader: 'babel-loader',
Expand All @@ -69,9 +73,7 @@ module.exports = {
}, {
test: /\.js$/,
include: [
path.resolve('tests'),
path.resolve('examples'),
path.resolve('tutorials')
path.resolve('tests')
],
use: [{
loader: 'babel-loader',
Expand Down

0 comments on commit 404f1f2

Please sign in to comment.