From 26fb702a17698e9188e207a7c2892138d57c50f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20de=20Alba?= Date: Thu, 6 Feb 2025 17:49:11 +0100 Subject: [PATCH 1/2] Fix docs build in readthedocs (#6684) Co-authored-by: Steve Piercy --- .readthedocs.yaml | 1 + packages/volto/news/6684.internal | 1 + 2 files changed, 2 insertions(+) create mode 100644 packages/volto/news/6684.internal diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c275fb847c..869f6c1fbe 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -26,6 +26,7 @@ build: # Install dependencies defined in your ``package.json`` # - npm ci # Install any other extra dependencies to build the docs + - npm i -g corepack@latest - corepack enable - corepack prepare pnpm@* --activate - asdf reshim nodejs diff --git a/packages/volto/news/6684.internal b/packages/volto/news/6684.internal new file mode 100644 index 0000000000..b7cdad95a7 --- /dev/null +++ b/packages/volto/news/6684.internal @@ -0,0 +1 @@ +Fix documentation build at Read the Docs. @sneridagh From 43df0e961366945a58d1414874ad62d1ee02044d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20de=20Alba?= Date: Thu, 6 Feb 2025 23:31:26 +0100 Subject: [PATCH 2/2] Use Plone 6.1.0rc1 (#6682) Co-authored-by: David Glick --- Makefile | 2 +- packages/client/news/6682.internal | 1 + packages/client/src/restapi/aliases/get.test.tsx | 3 ++- .../client/src/restapi/aliases/get_list.test.tsx | 3 ++- packages/client/src/restapi/content/get.test.tsx | 10 +++++----- packages/client/src/restapi/history/get.test.tsx | 4 +++- packages/components/Makefile | 2 +- packages/components/news/6682.internal | 1 + packages/generator-volto/README.md | 6 +++--- .../generators/app/templates/Makefile | 2 +- packages/generator-volto/news/6682.internal | 1 + packages/scripts/check_deployment.js | 2 +- packages/scripts/news/6682.internal | 1 + packages/seven/Makefile | 14 ++++++++------ .../seven/cypress/tests/core/basic/basic.cy.ts | 2 +- packages/seven/news/6682.internal | 1 + packages/volto/Makefile | 14 ++++++++------ packages/volto/cypress/tests/core/basic/a11y.js | 10 ++++++++++ .../tests/core/blocks/listing/blocks-listing.js | 1 - packages/volto/cypress/tests/workingCopy/create.js | 2 +- packages/volto/docker-compose.yml | 4 ++-- packages/volto/news/6682.internal | 1 + variables.mk | 4 ++-- 23 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 packages/client/news/6682.internal create mode 100644 packages/components/news/6682.internal create mode 100644 packages/generator-volto/news/6682.internal create mode 100644 packages/scripts/news/6682.internal create mode 100644 packages/seven/news/6682.internal create mode 100644 packages/volto/news/6682.internal diff --git a/Makefile b/Makefile index b689fac12c..03734011b3 100644 --- a/Makefile +++ b/Makefile @@ -387,7 +387,7 @@ plone5-acceptance-backend-start: ## Start backend acceptance server for Plone 5 .PHONY: acceptance-server-detached-start acceptance-server-detached-start: ## Starts test acceptance server main fixture in detached mode (daemon) - docker run -d --name plone-client-acceptance-server -i --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) + docker run -d --name plone-client-acceptance-server -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default,plone.app.discussion:default $(DOCKER_IMAGE_ACCEPTANCE) .PHONY: acceptance-server-detached-stop acceptance-server-detached-stop: ## Stop test acceptance server main fixture in detached mode (daemon) diff --git a/packages/client/news/6682.internal b/packages/client/news/6682.internal new file mode 100644 index 0000000000..ace2e8fa6d --- /dev/null +++ b/packages/client/news/6682.internal @@ -0,0 +1 @@ +Test with Plone 6.1.0rc1. @sneridagh diff --git a/packages/client/src/restapi/aliases/get.test.tsx b/packages/client/src/restapi/aliases/get.test.tsx index f49a54a0f6..7aea1c5a56 100644 --- a/packages/client/src/restapi/aliases/get.test.tsx +++ b/packages/client/src/restapi/aliases/get.test.tsx @@ -7,7 +7,8 @@ const cli = ploneClient.initialize({ apiPath: 'http://localhost:55001/plone', }); -const { getAliasesQuery } = cli; +const { login, getAliasesQuery } = cli; +await login({ username: 'admin', password: 'secret' }); describe('[GET] Aliases', () => { test('Hook - Successful', async () => { diff --git a/packages/client/src/restapi/aliases/get_list.test.tsx b/packages/client/src/restapi/aliases/get_list.test.tsx index b60a18e429..dcb35ee4a4 100644 --- a/packages/client/src/restapi/aliases/get_list.test.tsx +++ b/packages/client/src/restapi/aliases/get_list.test.tsx @@ -7,7 +7,8 @@ const cli = ploneClient.initialize({ apiPath: 'http://localhost:55001/plone', }); -const { getAliasesListQuery } = cli; +const { login, getAliasesListQuery } = cli; +await login({ username: 'admin', password: 'secret' }); describe('[GET] AliasesList', () => { test('Hook - Successful', async () => { diff --git a/packages/client/src/restapi/content/get.test.tsx b/packages/client/src/restapi/content/get.test.tsx index aa47a3b170..91062d2010 100644 --- a/packages/client/src/restapi/content/get.test.tsx +++ b/packages/client/src/restapi/content/get.test.tsx @@ -18,7 +18,7 @@ describe('[GET] Content', () => { await waitFor(() => expect(result.current.isSuccess).toBe(true)); - expect(result.current.data?.title).toBe('Welcome to Plone 6!'); + expect(result.current.data?.title).toBe('Welcome to Plone'); }); test('Hook - Failure', async () => { @@ -41,7 +41,7 @@ describe('[GET] Content', () => { await waitFor(() => expect(result.current.isSuccess).toBe(true)); - expect(result.current.data?.title).toBe('Welcome to Plone 6!'); + expect(result.current.data?.title).toBe('Welcome to Plone'); }); test('Hook - expand', async () => { @@ -59,7 +59,7 @@ describe('[GET] Content', () => { await waitFor(() => expect(result.current.isSuccess).toBe(true)); - expect(result.current.data?.title).toBe('Welcome to Plone 6!'); + expect(result.current.data?.title).toBe('Welcome to Plone'); expect( result.current.data?.['@components']?.breadcrumbs?.items, ).toStrictEqual([]); @@ -90,7 +90,7 @@ describe('[GET] Content', () => { await waitFor(() => expect(result.current.isSuccess).toBe(true)); - expect(result.current.data?.title).toBe('Welcome to Plone 6!'); + expect(result.current.data?.title).toBe('Welcome to Plone'); }); test.skip('Hook - fullObjects && version', async () => { @@ -106,7 +106,7 @@ describe('[GET] Content', () => { await waitFor(() => expect(result.current.isSuccess).toBe(true)); - expect(result.current.data?.title).toBe('Welcome to Plone 6!'); + expect(result.current.data?.title).toBe('Welcome to Plone'); }); }); diff --git a/packages/client/src/restapi/history/get.test.tsx b/packages/client/src/restapi/history/get.test.tsx index 924d540d46..c48a1f9c07 100644 --- a/packages/client/src/restapi/history/get.test.tsx +++ b/packages/client/src/restapi/history/get.test.tsx @@ -29,7 +29,9 @@ describe('[GET] History', () => { await waitFor(() => expect(result.current.isSuccess).toBe(true)); - expect(result.current.data?.[0].action).toBe('Create'); + expect(result.current.data?.[result.current.data?.length - 1].action).toBe( + 'Create', + ); }); test('Hook - Failure', async () => { diff --git a/packages/components/Makefile b/packages/components/Makefile index 8393f631a1..bd414b66b7 100644 --- a/packages/components/Makefile +++ b/packages/components/Makefile @@ -23,7 +23,7 @@ help: ## This help message .PHONY: start-test-acceptance-server start-test-acceptance-server: ## Start Test Acceptance Server Main Fixture (docker container) - docker run -i --rm -d -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING + docker run -i --rm -d -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING .PHONY: build-storybook build-storybook: ## Build Storybook diff --git a/packages/components/news/6682.internal b/packages/components/news/6682.internal new file mode 100644 index 0000000000..ace2e8fa6d --- /dev/null +++ b/packages/components/news/6682.internal @@ -0,0 +1 @@ +Test with Plone 6.1.0rc1. @sneridagh diff --git a/packages/generator-volto/README.md b/packages/generator-volto/README.md index 06de6061b0..86749ab664 100644 --- a/packages/generator-volto/README.md +++ b/packages/generator-volto/README.md @@ -35,7 +35,7 @@ yo @plone/volto ``` This will bootstrap a new Volto project inside the current folder. -It will ask a few questions for the project name, project description, and a list of add-ons. +It will ask a few questions for the project name, project description, and a list of add-ons. Run: @@ -66,7 +66,7 @@ Arguments: to see a full list of options and arguments. -> [!NOTE] +> [!NOTE] > In addition to the Volto project, the generator creates a theme add-on inside `src/addons` with the default name of `volto-[]`. > You can provide a specific name for the theme add-on that is created on project generation like: > ```shell @@ -183,7 +183,7 @@ Please note that you have to run a Plone backend as well. E.g. with docker: ```shell -docker run -it --rm --name=plone -p 8080:8080 -e SITE=Plone -e PROFILES="plone.volto:default-homepage" plone/plone-backend:6.0.8 +docker run -it --rm --name=plone -p 8080:8080 -e SITE=Plone -e PROFILES="plone.volto:default" plone/plone-backend:6.1.0rc1 ``` Consult the [Plone frontend Volto documentation](https://6.docs.plone.org/volto/index.html) for further details. diff --git a/packages/generator-volto/generators/app/templates/Makefile b/packages/generator-volto/generators/app/templates/Makefile index 4a5a606c1f..1f9a354909 100644 --- a/packages/generator-volto/generators/app/templates/Makefile +++ b/packages/generator-volto/generators/app/templates/Makefile @@ -75,7 +75,7 @@ start-test-acceptance-server start-test-backend : ## Start Test Plone Backend @echo "$(GREEN)==> Start Test Plone Backend$(RESET)" docker run -i --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) ## KGS in case you need a Plone 5.2 series (comment/remove above line): - # docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS5) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE5) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING + # docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS5) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE5) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING .PHONY: start-test-acceptance-frontend start-test-acceptance-frontend: ## Start the Acceptance Frontend Fixture diff --git a/packages/generator-volto/news/6682.internal b/packages/generator-volto/news/6682.internal new file mode 100644 index 0000000000..ace2e8fa6d --- /dev/null +++ b/packages/generator-volto/news/6682.internal @@ -0,0 +1 @@ +Test with Plone 6.1.0rc1. @sneridagh diff --git a/packages/scripts/check_deployment.js b/packages/scripts/check_deployment.js index feb3ea0092..5c7af654ab 100644 --- a/packages/scripts/check_deployment.js +++ b/packages/scripts/check_deployment.js @@ -2,7 +2,7 @@ import http from 'http'; import waitOn from 'wait-on'; const url = new URL('http://localhost:3000'); // replace with your service URL -const searchString = 'Welcome to Plone'; // replace with the string you want to search for +const searchString = 'Plone Site'; // replace with the string you want to search for // Wait for the service to be available waitOn({ resources: [url.href] }) diff --git a/packages/scripts/news/6682.internal b/packages/scripts/news/6682.internal new file mode 100644 index 0000000000..ace2e8fa6d --- /dev/null +++ b/packages/scripts/news/6682.internal @@ -0,0 +1 @@ +Test with Plone 6.1.0rc1. @sneridagh diff --git a/packages/seven/Makefile b/packages/seven/Makefile index cdaeadb163..8396276c40 100644 --- a/packages/seven/Makefile +++ b/packages/seven/Makefile @@ -131,15 +131,17 @@ acceptance-frontend-dev-start: ## Start acceptance frontend in development mode .PHONY: acceptance-backend-start acceptance-backend-start: ## Start backend acceptance server - #docker run -it --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) + # docker run -it --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) + docker run -it --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default $(DOCKER_IMAGE_ACCEPTANCE) # Uncomment next line and comment line above to use a custom image with the acceptance server (in case you need to use an specific backend add-on or version) - docker run -it --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING + # docker run -it --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING .PHONY: ci-acceptance-backend-start ci-acceptance-backend-start: ## Start backend acceptance server in headless mode for CI - docker run -i --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) + # docker run -i --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) + docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default $(DOCKER_IMAGE_ACCEPTANCE) # Uncomment next line and comment line above to use a custom image with the acceptance server (in case you need to use an specific backend add-on or version) - # docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING + # docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING .PHONY: acceptance-frontend-prod-start acceptance-frontend-prod-start: build-deps ## Start acceptance frontend in production mode @@ -185,7 +187,7 @@ project-acceptance-frontend-prod-start: build-deps ## Start acceptance frontend .PHONY: coresandbox-acceptance-backend-start coresandbox-acceptance-backend-start: ## Start backend acceptance server for core sandbox tests - docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage,plone.volto:coresandbox -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors,plone.volto.coresandbox $(DOCKER_IMAGE_ACCEPTANCE) + docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default,plone.volto:coresandbox -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors,plone.volto.coresandbox $(DOCKER_IMAGE_ACCEPTANCE) .PHONY: coresandbox-acceptance-frontend-prod-start coresandbox-acceptance-frontend-prod-start: build-deps ## Start acceptance frontend in production mode for core sandbox tests @@ -255,7 +257,7 @@ deployment-multilingual-ci-acceptance-test-run-all: ## With a single command, ru .PHONY: working-copy-acceptance-backend-start working-copy-acceptance-backend-start: ## Start backend acceptance server for working copy tests - docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.app.iterate:default,plone.volto:default-homepage $(DOCKER_IMAGE_ACCEPTANCE) + docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.app.iterate:default,plone.volto:default $(DOCKER_IMAGE_ACCEPTANCE) .PHONY: working-copy-acceptance-frontend-prod-start working-copy-acceptance-frontend-prod-start: build-deps ## Start acceptance frontend in production mode for working copy tests diff --git a/packages/seven/cypress/tests/core/basic/basic.cy.ts b/packages/seven/cypress/tests/core/basic/basic.cy.ts index 8dcc86dac6..7632f0d343 100644 --- a/packages/seven/cypress/tests/core/basic/basic.cy.ts +++ b/packages/seven/cypress/tests/core/basic/basic.cy.ts @@ -2,7 +2,7 @@ describe('Basic Cypress Test', () => { it('should visit the root URL', () => { cy.visit('/'); cy.url().should('eq', Cypress.config().baseUrl + '/'); - cy.contains('Welcome to Plone 6'); + cy.contains('Plone'); }); it('html tag has the lang attr', () => { diff --git a/packages/seven/news/6682.internal b/packages/seven/news/6682.internal new file mode 100644 index 0000000000..ace2e8fa6d --- /dev/null +++ b/packages/seven/news/6682.internal @@ -0,0 +1 @@ +Test with Plone 6.1.0rc1. @sneridagh diff --git a/packages/volto/Makefile b/packages/volto/Makefile index c6f2ec636b..83d105fe33 100644 --- a/packages/volto/Makefile +++ b/packages/volto/Makefile @@ -124,15 +124,17 @@ acceptance-frontend-dev-start: ## Start acceptance frontend in development mode .PHONY: acceptance-backend-start acceptance-backend-start: ## Start backend acceptance server - docker run -it --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) + # docker run -it --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) + docker run -it --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default,plone.app.discussion:default $(DOCKER_IMAGE_ACCEPTANCE) # Uncomment next line and comment line above to use a custom image with the acceptance server (in case you need to use an specific backend add-on or version) - # docker run -it --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING + # docker run -it --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING .PHONY: ci-acceptance-backend-start ci-acceptance-backend-start: ## Start backend acceptance server in headless mode for CI - docker run -i --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) + # docker run -i --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE) + docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default,plone.app.discussion:default $(DOCKER_IMAGE_ACCEPTANCE) # Uncomment next line and comment line above to use a custom image with the acceptance server (in case you need to use an specific backend add-on or version) - # docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING + # docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING .PHONY: acceptance-frontend-prod-start acceptance-frontend-prod-start: build-deps ## Start acceptance frontend in production mode @@ -178,7 +180,7 @@ project-acceptance-frontend-prod-start: build-deps ## Start acceptance frontend .PHONY: coresandbox-acceptance-backend-start coresandbox-acceptance-backend-start: ## Start backend acceptance server for core sandbox tests - docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage,plone.volto:coresandbox -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors,plone.volto.coresandbox $(DOCKER_IMAGE_ACCEPTANCE) + docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default,plone.volto:coresandbox -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors,plone.volto.coresandbox $(DOCKER_IMAGE_ACCEPTANCE) .PHONY: coresandbox-acceptance-frontend-prod-start coresandbox-acceptance-frontend-prod-start: build-deps ## Start acceptance frontend in production mode for core sandbox tests @@ -248,7 +250,7 @@ deployment-multilingual-ci-acceptance-test-run-all: ## With a single command, ru .PHONY: working-copy-acceptance-backend-start working-copy-acceptance-backend-start: ## Start backend acceptance server for working copy tests - docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.app.iterate:default,plone.volto:default-homepage $(DOCKER_IMAGE_ACCEPTANCE) + docker run -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.app.iterate:default,plone.volto:default $(DOCKER_IMAGE_ACCEPTANCE) .PHONY: working-copy-acceptance-frontend-prod-start working-copy-acceptance-frontend-prod-start: build-deps ## Start acceptance frontend in production mode for working copy tests diff --git a/packages/volto/cypress/tests/core/basic/a11y.js b/packages/volto/cypress/tests/core/basic/a11y.js index 593c2b4889..67f8f5e676 100644 --- a/packages/volto/cypress/tests/core/basic/a11y.js +++ b/packages/volto/cypress/tests/core/basic/a11y.js @@ -5,6 +5,16 @@ describe('Accessibility Tests', () => { }); it('Front page has not a11y violations', () => { + cy.configureAxe({ + rules: [ + // Disabled until we fix robotframework to install the volto distribution + // with example content + { + id: 'page-has-heading-one', + enabled: false, + }, + ], + }); cy.checkA11y(); // fail for a11y violations }); diff --git a/packages/volto/cypress/tests/core/blocks/listing/blocks-listing.js b/packages/volto/cypress/tests/core/blocks/listing/blocks-listing.js index c16f2c95e7..d42791f19d 100644 --- a/packages/volto/cypress/tests/core/blocks/listing/blocks-listing.js +++ b/packages/volto/cypress/tests/core/blocks/listing/blocks-listing.js @@ -444,7 +444,6 @@ describe('Listing Block Tests', () => { ); //add listing block - cy.scrollTo('bottom'); cy.getSlate().click(); cy.get('.ui.basic.icon.button.block-add-button').click(); cy.get('.ui.basic.icon.button.listing').contains('Listing').click(); diff --git a/packages/volto/cypress/tests/workingCopy/create.js b/packages/volto/cypress/tests/workingCopy/create.js index b76d116862..c5b21d392d 100644 --- a/packages/volto/cypress/tests/workingCopy/create.js +++ b/packages/volto/cypress/tests/workingCopy/create.js @@ -62,6 +62,6 @@ describe('Working Copy Tests - Create', () => { it('Portal root has create option', function () { cy.visit('/'); cy.get('#toolbar-more').click(); - cy.get('.menu-more').contains('Create working copy').should('not.exist'); + cy.get('.menu-more').contains('Create working copy').should('exist'); }); }); diff --git a/packages/volto/docker-compose.yml b/packages/volto/docker-compose.yml index ba7948726a..a899cbc8a4 100644 --- a/packages/volto/docker-compose.yml +++ b/packages/volto/docker-compose.yml @@ -2,14 +2,14 @@ version: '3.3' services: backend: - image: plone/plone-backend:6.0.5 + image: plone/plone-backend:6.1.0rc1 # Plone 5.2 series can be used too # image: plone/plone-backend:5.2.10 ports: - '8080:8080' environment: - SITE=Plone - - 'PROFILES=plone.volto:default-homepage' + - 'PROFILES=plone.volto:default' labels: - traefik.enable=true # SERVICE diff --git a/packages/volto/news/6682.internal b/packages/volto/news/6682.internal new file mode 100644 index 0000000000..ace2e8fa6d --- /dev/null +++ b/packages/volto/news/6682.internal @@ -0,0 +1 @@ +Test with Plone 6.1.0rc1. @sneridagh diff --git a/variables.mk b/variables.mk index 6b621286d2..dbcc2eb794 100644 --- a/variables.mk +++ b/variables.mk @@ -1,6 +1,6 @@ INSTANCE_PORT=8080 -DOCKER_IMAGE=plone/server-dev:6.0.13 -DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.13 +DOCKER_IMAGE=plone/server-dev:6.1.0rc1 +DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.1.0rc1 KGS= NODEBIN = ./node_modules/.bin SCRIPTSPACKAGE = ./packages/scripts