Branch: refs/heads/backport/stable-18.4.x/XWIKI-25221 Home: https://github.com/xwiki/xwiki-platform Commit: c9049cf6a8f58fe658612a41fbad487302fff01f https://github.com/xwiki/xwiki-platform/commit/c9049cf6a8f58fe658612a41fbad4... Author: Vincent Massol <[email protected]> Date: 2026-10-09 (Fri, 09 Oct 2026) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/MacroIT.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/QuickActionsIT.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditor.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorBalloonToolBar.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/CKEditorToolBar.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/src/test/it/org/xwiki/edit/test/ui/InplaceEditIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-test/xwiki-platform-wysiwyg-test-pageobjects/src/main/java/org/xwiki/wysiwyg/test/po/MacroDialogEditModal.java M xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-test/xwiki-platform-wysiwyg-test-pageobjects/src/main/java/org/xwiki/wysiwyg/test/po/MacroDialogSelectModal.java Log Message: ----------- XWIKI-25221: Make the CKEditor test page objects wait for the content refresh after inserting or editing a macro (#6689) * Submitting the macro edit modal opened from the tool bar, the balloon tool bar or by pressing Enter on a selected macro now waits for the macro to be re-rendered * Add RichTextAreaElement#editSelectedMacro(), #executeQuickAction(), #insertMacro() and #insertMacroWithRequiredParameters() * Remove the corresponding waits from MacroIT, QuickActionsIT, InplaceEditIT and RealtimeWYSIWYGEditorIT, keeping only the waits that only the test can know about Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]> (cherry picked from commit deeb610873ce7f20d558922e187c5b18fda53cea) (cherry picked from commit a007051e7805cbd9cbf8e5b5e8cdbc654601f8ba) Commit: 982aae202fba1f52330274ab8e6641229b53c68a https://github.com/xwiki/xwiki-platform/commit/982aae202fba1f52330274ab8e664... Author: Vincent Massol <[email protected]> Date: 2026-10-09 (Fri, 09 Oct 2026) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/ImageIT.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/src/test/it/org/xwiki/ckeditor/test/ui/QuickActionsIT.java M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/src/test/it/org/xwiki/edit/test/ui/InplaceEditIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java Log Message: ----------- XWIKI-25224: Use the rich text area page object to run quick actions in the CKEditor functional tests (#6692) * XWIKI-25221: Make the CKEditor test page objects wait for the content refresh after inserting or editing a macro * Submitting the macro edit modal opened from the tool bar, the balloon tool bar or by pressing Enter on a selected macro now waits for the macro to be re-rendered * Add RichTextAreaElement#editSelectedMacro(), #executeQuickAction(), #insertMacro() and #insertMacroWithRequiredParameters() * Remove the corresponding waits from MacroIT, QuickActionsIT, InplaceEditIT and RealtimeWYSIWYGEditorIT, keeping only the waits that only the test can know about Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]> * XWIKI-25224: Use the rich text area page object to run quick actions in the CKEditor functional tests * Replace the hand-coded quick action sequences (type the query, wait for the item to be selected, press Enter, wait for it to be submitted) with RichTextAreaElement#executeQuickAction() in QuickActionsIT, ImageIT, InplaceEditIT and RealtimeWYSIWYGEditorIT * Use insertMacro() / insertMacroWithRequiredParameters() for the quick actions that insert a macro, removing the waits for the content to be reloaded (re-creating the rich text area page object or waiting for the macro output text) Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]> --------- Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]> (cherry picked from commit e437df1fbdf7a4784bd4bc86e3274cbd180585b5) Compare: https://github.com/xwiki/xwiki-platform/compare/c9049cf6a8f5%5E...982aae202f... To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications