Branch: refs/heads/master
Home:
https://github.com/xwiki/xwiki-platform
Commit: 4360427b09f66ad81196df587d9afffbe2c6c0b0
https://github.com/xwiki/xwiki-platform/commit/4360427b09f66ad81196df587d9a…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-11-22 (Wed, 22 Nov 2023)
Changed paths:
M
xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/pom.xml
M
xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsEmailsIT.java
A
xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail1.txt
A
xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail2.txt
R
xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedMail1.txt
R
xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedMail2.txt
A
xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedPlainTextMail1.txt
A
xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedPlainTextMail2.txt
M
xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm
Log Message:
-----------
XWIKI-21589: Email notifications events description is not properly rendered
* Fix: ensure to use include the templates containing commons
notifications macros in notification email macros
* Test: improve existing integration test to only check the txt
version of the mails but also the html. Use pattern matching for
this with ignoring whitespaces: we cannot perform an exact match as
some part of the Html are random (e.g. random UUID for cache protection
of some assets, and ids of the events)