From 85bdaa3362a52db1eba6bbea9ecc47568e883704 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 14:04:05 +0000 Subject: [PATCH 1/2] build(deps): bump tinymce from 7.3.0 to 7.6.0 Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce) from 7.3.0 to 7.6.0. - [Changelog](https://github.com/tinymce/tinymce/blob/main/modules/tinymce/CHANGELOG.md) - [Commits](https://github.com/tinymce/tinymce/commits/7.6.0/modules/tinymce) --- updated-dependencies: - dependency-name: tinymce dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6fa52f1ab5b..14b1db820c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -64,7 +64,7 @@ "spin.js": "^4.1.2", "swagger-ui-dist": "^5.18.2", "tinycolor2": "^1.6.0", - "tinymce": "^7.3.0", + "tinymce": "^7.6.0", "tinymce-i18n": "^24.11.25", "vue": "^3.5.13" }, @@ -14088,9 +14088,9 @@ "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" }, "node_modules/tinymce": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-7.3.0.tgz", - "integrity": "sha512-Ls4PgYlpk73XAxBSBqbVmSl8Mb3DuNfgF01GZ0lY6/MOEVRl3IL+VxC1Oe6165e8WqbqVsxO3Qj/PmoYNvQKGQ==" + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-7.6.0.tgz", + "integrity": "sha512-kUrklnD7H8JbpSDEGRh51GKK6Mrf+pR9neSDzUHvXKV+2oRtMB7sqfAtEOnM0/WKdstwaX0qoNCZNo2H1Y0EFA==" }, "node_modules/tinymce-i18n": { "version": "24.11.25", diff --git a/package.json b/package.json index 3daf75a5237..07ecb03a6a6 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "spin.js": "^4.1.2", "swagger-ui-dist": "^5.18.2", "tinycolor2": "^1.6.0", - "tinymce": "^7.3.0", + "tinymce": "^7.6.0", "tinymce-i18n": "^24.11.25", "vue": "^3.5.13" }, From 832de753d33c37ed722f334856d2199ab1bd3f66 Mon Sep 17 00:00:00 2001 From: AdrienClairembault Date: Wed, 18 Dec 2024 15:48:42 +0100 Subject: [PATCH 2/2] Update our tests to match new tinymce behavior --- tests/cypress/e2e/form/form_destination.cy.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/cypress/e2e/form/form_destination.cy.js b/tests/cypress/e2e/form/form_destination.cy.js index 390f4795140..fdd2f81277a 100644 --- a/tests/cypress/e2e/form/form_destination.cy.js +++ b/tests/cypress/e2e/form/form_destination.cy.js @@ -86,8 +86,9 @@ describe('Form destination', () => { .should('be.checked') ; cy.get("@content_field").parents().find("#tinymce") - .should('have.attr', 'contenteditable', "false") + .type('This field is not writable') ; + cy.get("@content_field").should('have.text', ''); // Nothing was written. // Ensure auto config values have been loaded for the "content" field cy.get("@content_field") @@ -99,9 +100,8 @@ describe('Form destination', () => { // Disable auto config for the "content" field (tinymce) cy.get("@content_auto_config_checkbox").uncheck(); cy.get("@content_field").parents().find("#tinymce") - .should('have.attr', 'contenteditable', "true") + .type('This field is writable') ; - cy.get("@content_field").type('Manual content'); // Save changes (page reload) cy.findByRole('button', {'name': "Update item"}).click(); @@ -113,15 +113,16 @@ describe('Form destination', () => { // Ensure the manual values are still there cy.get("@content_auto_config_checkbox").should('not.be.checked'); - cy.get("@content_field").should('have.text', 'Manual content'); + cy.get("@content_field").should('have.text', 'This field is writable'); }); describe('Revert to auto configurated values', () => { // Re-enable auto config for the "content" field cy.get("@content_auto_config_checkbox").check(); cy.get("@content_field").parents().find("#tinymce") - .should('have.attr', 'contenteditable', "false") + .type('This field is not writable') ; + cy.get("@content_field").should('have.text', 'This field is writable'); // Previous content, no chane=ges // Save changes (page reload) cy.findByRole('button', {'name': "Update item"}).click();