diff --git a/CHANGELOG.md b/CHANGELOG.md index c7353c07..4070d42e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,13 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). -### [0.1.21](https://github.com/eea/volto-cca-policy/compare/0.1.20...0.1.21) - 8 June 2023 +### [0.1.22](https://github.com/eea/volto-cca-policy/compare/0.1.21...0.1.22) - 9 June 2023 #### :hammer_and_wrench: Others -- Fix cluster name [Tiberiu Ichim - [`9668597`](https://github.com/eea/volto-cca-policy/commit/9668597dd7e9c73e611baf17c4c92acb1a4e3153)] +- test: Fix test config, coverage Refs #253277 [valentinab25 - [`7c2c269`](https://github.com/eea/volto-cca-policy/commit/7c2c26975607e37a6ac5ba2492c201ceb9ec9804)] +### [0.1.21](https://github.com/eea/volto-cca-policy/compare/0.1.20...0.1.21) - 8 June 2023 + ### [0.1.20](https://github.com/eea/volto-cca-policy/compare/0.1.19...0.1.20) - 8 June 2023 #### :hammer_and_wrench: Others diff --git a/Jenkinsfile b/Jenkinsfile index 8a5d6e1c..f1f3496f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -188,6 +188,7 @@ pipeline { def nodeJS = tool 'NodeJS'; withSonarQubeEnv('Sonarqube') { sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info''' + sh '''sed -i "s#src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info''' //sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER" sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done''' } diff --git a/jest-addon.config.js b/jest-addon.config.js index da383181..e23a6c34 100644 --- a/jest-addon.config.js +++ b/jest-addon.config.js @@ -5,6 +5,7 @@ module.exports = { '!src/**/*.d.ts', ], moduleNameMapper: { + '\\.(css|less|scss|sass)$': 'identity-obj-proxy', '@plone/volto/cypress': '/node_modules/@plone/volto/cypress', '@plone/volto/babel': '/node_modules/@plone/volto/babel', '@plone/volto/(.*)$': '/node_modules/@plone/volto/src/$1', @@ -17,7 +18,6 @@ module.exports = { '~/(.*)$': '/src/$1', 'load-volto-addons': '/node_modules/@plone/volto/jest-addons-loader.js', - '\\.(css|less|scss|sass)$': 'identity-obj-proxy', }, transform: { '^.+\\.js(x)?$': 'babel-jest', diff --git a/package.json b/package.json index 90cf17ef..8c713ca9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-cca-policy", - "version": "0.1.21", + "version": "0.1.22", "description": "@eeacms/volto-cca-policy: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",