diff --git a/CHANGELOG.md b/CHANGELOG.md index 94ebd66..394c50f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,17 @@ 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). -#### [3.0.0](https://github.com/eea/volto-block-toc/compare/2.3.0...3.0.0) +#### [3.0.1](https://github.com/eea/volto-block-toc/compare/3.0.0...3.0.1) + +### [3.0.0](https://github.com/eea/volto-block-toc/compare/2.3.0...3.0.0) + +> 17 May 2022 + +- Update HTML output to use semantic listing elements: ol, ul, li by using as [`#11`](https://github.com/eea/volto-block-toc/pull/11) - Release 3.0.0 [`0cf1e0a`](https://github.com/eea/volto-block-toc/commit/0cf1e0a62c98dc89c69328a85f96b2b6cadf036c) - Improved ToC view [`0ce83a0`](https://github.com/eea/volto-block-toc/commit/0ce83a0c84257adbef2688e42b33c407216c4f72) - Remove console.log [`e0457fb`](https://github.com/eea/volto-block-toc/commit/e0457fb8e014be6d1c32052968480138f5f84493) -- Update HTML output to use semantic listing elements: ol, ul, li by using as [`d48ca86`](https://github.com/eea/volto-block-toc/commit/d48ca86397c2d6731264ad6e9345bab8612d8263) #### [2.3.0](https://github.com/eea/volto-block-toc/compare/2.2.5...2.3.0) diff --git a/Jenkinsfile b/Jenkinsfile index c60d6ad..5e00982 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,8 +4,9 @@ pipeline { environment { GIT_NAME = "volto-block-toc" NAMESPACE = "@eeacms" - SONARQUBE_TAGS = "volto.eea.europa.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu" + SONARQUBE_TAGS = "volto.eea.europa.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu" DEPENDENCIES = "" + VOLTO = "alpha" } stages { @@ -124,9 +125,8 @@ pipeline { node(label: 'docker') { script { try { - sh '''docker pull plone; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg''' - sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" plone/volto-addon-ci cypress''' - } finally { + sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend''' + sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=development -e VOLTO="$VOLTO" plone/volto-addon-ci cypress''' } finally { try { sh '''rm -rf cypress-reports cypress-results cypress-coverage''' sh '''mkdir -p cypress-reports cypress-results cypress-coverage''' diff --git a/cypress.json b/cypress.json index aef675e..736dedd 100644 --- a/cypress.json +++ b/cypress.json @@ -1,9 +1,14 @@ { "baseUrl": "http://localhost:3000", "viewportWidth": 1280, - "defaultCommandTimeout": 15000, + "defaultCommandTimeout": 8888, + "chromeWebSecurity": false, "reporter": "junit", "video": true, + "retries": { + "runMode": 8, + "openMode": 0 + }, "reporterOptions": { "mochaFile": "cypress/reports/cypress-[hash].xml", "jenkinsMode": true, diff --git a/cypress/support/index.js b/cypress/support/index.js index 89aab00..32395ab 100644 --- a/cypress/support/index.js +++ b/cypress/support/index.js @@ -27,7 +27,7 @@ coverage-end */ export const setupBeforeEach = () => { cy.autologin(); cy.createContent({ - contentType: 'Folder', + contentType: 'Document', contentId: 'cypress', contentTitle: 'Cypress', }); diff --git a/package.json b/package.json index 43389dd..5c4a4c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-block-toc", - "version": "3.0.0", + "version": "3.0.1", "description": "volto-block-toc: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",