Merge branch 'develop' into devgurjar

element-hq · Oct 28, 2024 · fa48846 · fa48846
2 parents 9280c90 + 954ff0a
commit fa48846
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/playwright/e2e/pinned-messages/index.ts b/playwright/e2e/pinned-messages/index.ts
@@ -196,14 +196,7 @@ export class Helpers {
      */
     async assertEmptyPinnedMessagesList() {
         const rightPanel = this.getRightPanel();
-        await expect(rightPanel).toMatchScreenshot(`pinned-messages-list-empty.png`, {
-            // hide the tooltip "Room information" to avoid flakiness
-            css: `
-                [data-floating-ui-portal] {
-                    display: none !important;
-                }
-            `,
-        });
+        await expect(rightPanel).toMatchScreenshot(`pinned-messages-list-empty.png`);
     }
 
     /**

diff --git a/playwright/e2e/release-announcement/index.ts b/playwright/e2e/release-announcement/index.ts
@@ -42,7 +42,7 @@ export class Helpers {
      */
     async assertReleaseAnnouncementIsVisible(name: string) {
         await expect(this.getReleaseAnnouncement(name)).toBeVisible();
-        await expect(this.page).toMatchScreenshot(`release-announcement-${name}.png`);
+        await expect(this.page).toMatchScreenshot(`release-announcement-${name}.png`, { showTooltips: true });
     }
 
     /**

diff --git a/playwright/element-web-test.ts b/playwright/element-web-test.ts
@@ -345,6 +345,7 @@ export const expect = baseExpect.extend({
 
         if (!options?.showTooltips) {
             css += `
+                [data-floating-ui-portal],
                 [role="tooltip"] {
                     visibility: hidden !important;
                 }

diff --git a/...b.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png b/...b.spec.ts/Preferences-user-settings-tab-should-be-rendered-properly-1-linux.png
diff --git a/...snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png b/...snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png