From e3f483a20f1beb65437d02b79452423014553f2c Mon Sep 17 00:00:00 2001
From: Simon Urli <simon.urli@xwiki.com>
Date: Fri, 19 Jan 2024 09:17:26 +0100
Subject: [PATCH] XWIKI-21752: Email notifications events description do not
display the user avatar anymore
* Fix the wrong expectation for NotificationEmailsIT tests when
checking mail content (was containing bad code for users' avatars)
---
.../src/test/resources/expectedHtmlMail1.txt | 10 +++-------
.../src/test/resources/expectedHtmlMail2.txt | 10 +++-------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail1.txt b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail1.txt
index b199973308a..c10b4dd8d73 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail1.txt
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail1.txt
@@ -10,13 +10,9 @@
</div>
<a color="#0088CC" style="color: #0088CC; text-decoration: none;" href="https://externaldomain:4242/xwiki/bin/view/NotificationsEmailTest/Page1">Title 1</a>
</div>
- created by
- <span class="notification-event-user" data-xwiki-lightbox="false">
- <img src="https://externaldomain:4242/xwiki/bin/skin/resources/icons/xwiki/noavatar.png?cache-version=\E[0-9]+\Q" alt="NotificationsEmailsITuser1"/>
- <span class="wikilink">
- <a href="https://externaldomain:4242/xwiki/bin/view/XWiki/NotificationsEmailsITuser1">NotificationsEmailsITuser1</a>
- </span>
- </span>
+ created by <img src="cid:NotificationsEmailsITuser1.jpg" alt="N" width="16" height="16" style="vertical-align: middle;"/>
+ <a color="#0088CC" style="color: #0088CC; text-decoration: none;" href="https://externaldomain:4242/xwiki/bin/view/XWiki/NotificationsEmailsITuser1">NotificationsEmailsITuser1</a>
+
<div>
<small style="color: #777777; font-size: 0.8em;">
moments ago
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail2.txt b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail2.txt
index a585f2dc6f8..95f013bd2d8 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail2.txt
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/resources/expectedHtmlMail2.txt
@@ -10,13 +10,9 @@
</div>
<a color="#0088CC" style="color: #0088CC; text-decoration: none;" href="https://externaldomain:4242/xwiki/bin/view/NotificationsEmailTest/Page2">Title 2</a>
</div>
- created by
- <span class="notification-event-user" data-xwiki-lightbox="false">
- <img src="https://externaldomain:4242/xwiki/bin/skin/resources/icons/xwiki/noavatar.png?cache-version=\E[0-9]+\Q" alt="NotificationsEmailsITuser1"/>
- <span class="wikilink">
- <a href="https://externaldomain:4242/xwiki/bin/view/XWiki/NotificationsEmailsITuser1">NotificationsEmailsITuser1</a>
- </span>
- </span>
+ created by <img src="cid:NotificationsEmailsITuser1.jpg" alt="N" width="16" height="16" style="vertical-align: middle;"/>
+ <a color="#0088CC" style="color: #0088CC; text-decoration: none;" href="https://externaldomain:4242/xwiki/bin/view/XWiki/NotificationsEmailsITuser1">NotificationsEmailsITuser1</a>
+
<div>
<small style="color: #777777; font-size: 0.8em;">
moments ago
--
GitLab