Merge pull request #71 from eea/develop

Release
eea · Mar 20, 2024 · 7863b3b · 7863b3b
2 parents 9e7eaea + 6398bd2
commit 7863b3b
Show file tree

Hide file tree

Showing 7 changed files with 227 additions and 148 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@ 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.45](https://github.com/eea/volto-climate-advisory-board-policy/compare/0.1.44...0.1.45) - 20 March 2024
+
+#### :house: Internal changes
+
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`beaca73`](https://github.com/eea/volto-climate-advisory-board-policy/commit/beaca73d9302c994ecf16cbab5a135e1067fab78)]
+- chore: husky, lint-staged use fixed versions [valentinab25 - [`ffac416`](https://github.com/eea/volto-climate-advisory-board-policy/commit/ffac416145ce828592608b3bd9941522a5b2ee94)]
+
+#### :hammer_and_wrench: Others
+
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`691deea`](https://github.com/eea/volto-climate-advisory-board-policy/commit/691deea3c23dc9f63ff01044a6106a8b259ffe68)]
+- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`2bc839d`](https://github.com/eea/volto-climate-advisory-board-policy/commit/2bc839d43c528e8889d3686377a508d61c1f41ad)]
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`cc109f0`](https://github.com/eea/volto-climate-advisory-board-policy/commit/cc109f02b92ec7cd50e970678b13ae05533b2d7e)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`81e3d5f`](https://github.com/eea/volto-climate-advisory-board-policy/commit/81e3d5f40b6de028044f0939cda0e71c607d0921)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`6ad2378`](https://github.com/eea/volto-climate-advisory-board-policy/commit/6ad2378592e8c5022c181833c77186a6444a008a)]
 ### [0.1.44](https://github.com/eea/volto-climate-advisory-board-policy/compare/0.1.43...0.1.44) - 10 October 2023
 
 #### :house: Internal changes

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-builder:${VOLTO_VERSION}
+FROM eeacms/frontend-builder:${VOLTO_VERSION}
 
 ARG ADDON_NAME
 ARG ADDON_PATH

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/Makefile b/Makefile
@@ -50,6 +50,11 @@ VOLTO_VERSION?=16
 ADDON_PATH="${DIR}"
 ADDON_NAME="@eeacms/${ADDON_PATH}"
 DOCKER_COMPOSE=PLONE_VERSION=${PLONE_VERSION} VOLTO_VERSION=${VOLTO_VERSION} ADDON_NAME=${ADDON_NAME} ADDON_PATH=${ADDON_PATH} docker compose
+RAZZLE_INTERNAL_API_PATH?="http://localhost:8080/Plone"
+RAZZLE_DEV_PROXY_API_PATH?="${RAZZLE_INTERNAL_API_PATH}"
+CYPRESS_API_PATH="${RAZZLE_DEV_PROXY_API_PATH}"
+
+
 
 # Top-level targets
 .PHONY: all
@@ -77,11 +82,11 @@ shell:			## Start a shell in the frontend container
 
 .PHONY: cypress-open
 cypress-open:		## Open cypress integration tests
-	NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress open
+	CYPRESS_API_PATH="${RAZZLE_DEV_PROXY_API_PATH}" NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress open
 
 .PHONY: cypress-run
 cypress-run:	## Run cypress integration tests
-	NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress run
+	CYPRESS_API_PATH="${RAZZLE_DEV_PROXY_API_PATH}" NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress run --browser chromium
 
 .PHONY: test
 test:			## Run jest tests
@@ -129,3 +134,29 @@ i18n:			## i18n
 help:                   ## Show this help.
 	@echo -e "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)"
 	head -n 14 Makefile
+
+.PHONY: ci-fix
+ci-fix:
+	echo "Running lint-fix"
+	make lint-fix
+	echo "Running prettier-fix"
+	make prettier-fix
+	echo "Running stylelint-fix"
+	make stylelint-fix
+
+.PHONY: test-ci
+test-ci:
+	cd /app
+	RAZZLE_JEST_CONFIG=src/addons/${ADDON_PATH}/jest-addon.config.js CI=true yarn test src/addons/${ADDON_PATH}/src --watchAll=false --reporters=default --reporters=jest-junit --collectCoverage --coverageReporters lcov cobertura text
+
+.PHONY: start-ci
+start-ci:
+	cp .coverage.babel.config.js /app/babel.config.js
+	cd ../..
+	yarn start
+
+.PHONY: cypress-ci
+cypress-ci:
+	$(NODE_MODULES)/.bin/wait-on -t 240000  http://localhost:3000
+	NODE_ENV=development make cypress-run
+
diff --git a/cypress.config.js b/cypress.config.js
@@ -2,12 +2,12 @@ const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
   viewportWidth: 1280,
-  defaultCommandTimeout: 5000,
+  defaultCommandTimeout: 8888,
   chromeWebSecurity: false,
   reporter: 'junit',
-  video: true,
+  video: false,
   retries: {
-    runMode: 1,
+    runMode: 2,
     openMode: 0,
   },
   reporterOptions: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-climate-advisory-board-policy",
-  "version": "0.1.44",
+  "version": "0.1.45",
   "description": "@eeacms/volto-climate-advisory-board-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency",
@@ -36,8 +36,8 @@
     "babel-plugin-transform-class-properties": "^6.24.1",
     "cypress-fail-fast": "^5.0.1",
     "md5": "^2.3.0",
-    "husky": "*",
-    "lint-staged": "*"
+    "husky": "^8.0.3",
+    "lint-staged": "^14.0.1"
   },
   "lint-staged": {
     "src/**/*.{js,jsx,ts,tsx,json}": [

diff --git a/theme/extras/header.variables b/theme/extras/header.variables
@@ -9,7 +9,15 @@
 
 @topSectionBackground: #f0f4f5;
 
-@burgerActionBackgroundColor: #38445E;
-@megaMenuBackgroundColor: #38445E;
+@burgerActionBackgroundColor: #38445e;
+@megaMenuBackgroundColor: #38445e;
 
-@megaMenuSubTitleCountriesNestedGridMarginTop: -1rem;
+@megaMenuSubTitleCountriesNestedGridMarginTop: -1rem;
+
+// Theme Sites
+@mobileThemeSitesMenuWidth: 168px;
+@tabletThemeSitesMenuWidth: 168px;
+@computerThemeSitesMenuWidth: 225px;
+@themeSitesMenuSiteLinkColor: @blue-grey-6;
+@themeSitesMenuSiteLinkFontWeight: @normal;
+@mobileThemeSitesMenuLeft: 0px;