Skip to content

Commit 8d828b9

Browse files
committed
refactor: Use latest cypress
1 parent ee87998 commit 8d828b9

8 files changed

Lines changed: 39 additions & 24 deletions

File tree

.coverage.babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const defaultBabel = require('@plone/volto/babel');
22

33
function applyDefault(api) {
44
const voltoBabel = defaultBabel(api);
5-
voltoBabel.plugins.push('@babel/plugin-transform-modules-commonjs', 'transform-class-properties', 'istanbul');
5+
voltoBabel.plugins.push('istanbul');
66
return voltoBabel;
77
}
88

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ lib-cov
1717
# Coverage directory used by tools like istanbul
1818
coverage
1919

20+
screenshots
21+
22+
# Cypress
23+
cypress/videos
24+
cypress/reports
25+
2026
# nyc test coverage
2127
.nyc_output
2228

Jenkinsfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pipeline {
66
NAMESPACE = "@eeacms"
77
SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,biodiversity.europa.eu,forest.eea.europa.eu,www.eea.europa.eu-ims,sustainability.eionet.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,prod-www.eea.europa.eu,water.europa.eu-marine"
88
DEPENDENCIES = ""
9-
VOLTO = "16.0.0-alpha.14"
9+
VOLTO = "alpha"
1010
}
1111

1212
stages {
@@ -41,19 +41,19 @@ pipeline {
4141

4242
"ES lint": {
4343
node(label: 'docker') {
44-
sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci eslint'''
44+
sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e VOLTO="$VOLTO" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci eslint'''
4545
}
4646
},
4747

4848
"Style lint": {
4949
node(label: 'docker') {
50-
sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci stylelint'''
50+
sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e VOLTO="$VOLTO" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci stylelint'''
5151
}
5252
},
5353

5454
"Prettier": {
5555
node(label: 'docker') {
56-
sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci prettier'''
56+
sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e VOLTO="$VOLTO" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci prettier'''
5757
}
5858
}
5959
)
@@ -126,7 +126,7 @@ pipeline {
126126
script {
127127
try {
128128
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'''
129-
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'''
129+
sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e VOLTO="$VOLTO" -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'''
130130
} finally {
131131
try {
132132
sh '''rm -rf cypress-reports cypress-results cypress-coverage'''

cypress.config.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
const { defineConfig } = require('cypress');
2+
3+
module.exports = defineConfig({
4+
viewportWidth: 1280,
5+
defaultCommandTimeout: 8888,
6+
chromeWebSecurity: false,
7+
reporter: 'junit',
8+
video: true,
9+
retries: {
10+
runMode: 8,
11+
openMode: 0,
12+
},
13+
reporterOptions: {
14+
mochaFile: 'cypress/reports/cypress-[hash].xml',
15+
jenkinsMode: true,
16+
toConsole: true,
17+
},
18+
e2e: {
19+
setupNodeEvents(on, config) {
20+
return require('./cypress/plugins/index.js')(on, config);
21+
},
22+
baseUrl: 'http://localhost:3000',
23+
},
24+
});

cypress.json

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { setupBeforeEach, tearDownAfterEach } from '../support';
1+
import { setupBeforeEach, tearDownAfterEach } from '../support/e2e';
22

33
describe('Blocks Tests', () => {
44
beforeEach(setupBeforeEach);

jest-addon.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ module.exports = {
99
'@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
1010
'@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
1111
'@package/(.*)$': '<rootDir>/src/$1',
12+
'@root/(.*)$': '<rootDir>/src/$1',
1213
'@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
1314
'@eeacms/(.*?)/(.*)$': '<rootDir>/src/addons/$1/src/$2',
1415
'@plone/volto-slate':
1516
'<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
1617
'~/(.*)$': '<rootDir>/src/$1',
1718
'load-volto-addons':
1819
'<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
20+
'\\.(css|less|scss|sass)$': 'identity-obj-proxy',
1921
},
2022
transform: {
2123
'^.+\\.js(x)?$': 'babel-jest',

0 commit comments

Comments
 (0)