From 6ad5fcad1769cd5128decba2eb2a5e3d20ca3990 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Fri, 28 Oct 2022 20:51:59 +0300 Subject: [PATCH] test(jest): Re-enable tests --- Jenkinsfile | 100 +++++++++--------- __mocks__/styleMock.js | 1 - jest-addon.config.js | 7 +- src/ColumnsBlock/ColumnsBlockEdit.jsx | 2 +- .../ColumnsBlockView.test.js.snap | 8 +- 5 files changed, 56 insertions(+), 62 deletions(-) delete mode 100644 __mocks__/styleMock.js diff --git a/Jenkinsfile b/Jenkinsfile index c2cd19a..d249211 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,53 +60,53 @@ pipeline { } } - // stage('Tests') { - // when { - // allOf { - // environment name: 'CHANGE_ID', value: '' - // anyOf { - // not { changelog '.*^Automated release [0-9\\.]+$' } - // branch 'master' - // } - // } - // } - // steps { - // parallel( - - // "Volto": { - // node(label: 'docker') { - // script { - // try { - // sh '''docker pull plone/volto-addon-ci:alpha''' - // sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha''' - // sh '''rm -rf xunit-reports''' - // sh '''mkdir -p xunit-reports''' - // sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/coverage xunit-reports/''' - // sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/junit.xml xunit-reports/''' - // sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/unit_tests_log.txt xunit-reports/''' - // stash name: "xunit-reports", includes: "xunit-reports/**" - // archiveArtifacts artifacts: "xunit-reports/unit_tests_log.txt", fingerprint: true - // publishHTML (target : [ - // allowMissing: false, - // alwaysLinkToLastBuild: true, - // keepAll: true, - // reportDir: 'xunit-reports/coverage/lcov-report', - // reportFiles: 'index.html', - // reportName: 'UTCoverage', - // reportTitles: 'Unit Tests Code Coverage' - // ]) - // } finally { - // catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') { - // junit testResults: 'xunit-reports/junit.xml', allowEmptyResults: true - // } - // sh script: '''docker rm -v $BUILD_TAG-volto''', returnStatus: true - // } - // } - // } - // } - // ) - // } - // } + stage('Tests') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + anyOf { + not { changelog '.*^Automated release [0-9\\.]+$' } + branch 'master' + } + } + } + steps { + parallel( + + "Volto": { + node(label: 'docker') { + script { + try { + sh '''docker pull plone/volto-addon-ci:alpha''' + sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha''' + sh '''rm -rf xunit-reports''' + sh '''mkdir -p xunit-reports''' + sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/coverage xunit-reports/''' + sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/junit.xml xunit-reports/''' + sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/unit_tests_log.txt xunit-reports/''' + stash name: "xunit-reports", includes: "xunit-reports/**" + archiveArtifacts artifacts: "xunit-reports/unit_tests_log.txt", fingerprint: true + publishHTML (target : [ + allowMissing: false, + alwaysLinkToLastBuild: true, + keepAll: true, + reportDir: 'xunit-reports/coverage/lcov-report', + reportFiles: 'index.html', + reportName: 'UTCoverage', + reportTitles: 'Unit Tests Code Coverage' + ]) + } finally { + catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') { + junit testResults: 'xunit-reports/junit.xml', allowEmptyResults: true + } + sh script: '''docker rm -v $BUILD_TAG-volto''', returnStatus: true + } + } + } + } + ) + } + } stage('Integration tests') { when { @@ -182,13 +182,13 @@ pipeline { node(label: 'swarm') { script{ checkout scm - // unstash "xunit-reports" + unstash "xunit-reports" unstash "cypress-coverage" def scannerHome = tool 'SonarQubeScanner'; 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 "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 '''sed -i "s#/opt/frontend/my-volto-project/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 "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./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/__mocks__/styleMock.js b/__mocks__/styleMock.js deleted file mode 100644 index f053ebf..0000000 --- a/__mocks__/styleMock.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = {}; diff --git a/jest-addon.config.js b/jest-addon.config.js index 781982e..da38318 100644 --- a/jest-addon.config.js +++ b/jest-addon.config.js @@ -17,14 +17,13 @@ module.exports = { '~/(.*)$': '/src/$1', 'load-volto-addons': '/node_modules/@plone/volto/jest-addons-loader.js', - '\\.(css|less|scss|sass)$': - '/src/addons/volto-columns-block/__mocks__/styleMock.js', + '\\.(css|less|scss|sass)$': 'identity-obj-proxy', }, transform: { '^.+\\.js(x)?$': 'babel-jest', + '^.+\\.(png)$': 'jest-file', + '^.+\\.(jpg)$': 'jest-file', '^.+\\.(svg)$': './node_modules/@plone/volto/jest-svgsystem-transform.js', - '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': - 'jest-file', }, coverageThreshold: { global: { diff --git a/src/ColumnsBlock/ColumnsBlockEdit.jsx b/src/ColumnsBlock/ColumnsBlockEdit.jsx index 15c5c24..6bc4459 100644 --- a/src/ColumnsBlock/ColumnsBlockEdit.jsx +++ b/src/ColumnsBlock/ColumnsBlockEdit.jsx @@ -34,7 +34,7 @@ import { makeStyleSchema, getStyle } from '../Styles'; import tuneSVG from '@plone/volto/icons/column.svg'; import upSVG from '@plone/volto/icons/up.svg'; -import '@eeacms/volto-columns-block/less/columns.less'; +import '../less/columns.less'; const messages = defineMessages({ labelColumn: { diff --git a/src/ColumnsBlock/__snapshots__/ColumnsBlockView.test.js.snap b/src/ColumnsBlock/__snapshots__/ColumnsBlockView.test.js.snap index fd94c8a..74b3786 100644 --- a/src/ColumnsBlock/__snapshots__/ColumnsBlockView.test.js.snap +++ b/src/ColumnsBlock/__snapshots__/ColumnsBlockView.test.js.snap @@ -12,18 +12,14 @@ exports[`renders 2 columns 1`] = ` class="six wide computer twelve wide mobile six wide tablet column column-blocks-wrapper" >
-
- left marker -
+ left marker
-
- right -
+ right