diff --git a/bigbluebutton-tests/playwright/layouts/layouts.js b/bigbluebutton-tests/playwright/layouts/layouts.js index aa284e8a62f..27524439401 100644 --- a/bigbluebutton-tests/playwright/layouts/layouts.js +++ b/bigbluebutton-tests/playwright/layouts/layouts.js @@ -11,7 +11,7 @@ class Layouts extends MultiUsers { await this.modPage.closeAllToastNotifications(); await this.modPage.wasRemoved(e.toastContainer); - await checkScreenshots(this, 'should be the layout focus on presentation', e.webcamContainer, 'focus-on-presentation'); + await checkScreenshots(this, 'should be the layout focus on presentation', [e.webcamContainer, e.webcamMirroredVideoContainer], 'focus-on-presentation'); } async gridLayout() { @@ -22,7 +22,7 @@ class Layouts extends MultiUsers { await this.modPage.closeAllToastNotifications(); await this.modPage.wasRemoved(e.toastContainer); - await checkScreenshots(this, 'should be the grid layout', e.webcamContainer, 'grid-layout'); + await checkScreenshots(this, 'should be the grid layout', [e.webcamContainer, e.webcamMirroredVideoContainer], 'grid-layout'); } async smartLayout() { @@ -33,12 +33,12 @@ class Layouts extends MultiUsers { await this.modPage.closeAllToastNotifications(); await this.modPage.wasRemoved(e.toastContainer); - await checkScreenshots(this, 'should the cameras be above the presentation', e.webcamContainer, 'smart-layout', 1); + await checkScreenshots(this, 'should the cameras be above the presentation', [e.webcamContainer, e.webcamMirroredVideoContainer], 'smart-layout', 1); await this.modPage.waitAndClick(e.userListToggleBtn); await this.modPage.wasRemoved(e.chatButton, ''); - await checkScreenshots(this, 'should the cameras be on the side of presentation', e.webcamContainer, 'smart-layout', 2); + await checkScreenshots(this, 'should the cameras be on the side of presentation', [e.webcamContainer, e.webcamMirroredVideoContainer], 'smart-layout', 2); await reopenChatSidebar(this.modPage); } diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-1-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-1-Chromium-linux.png index f6677357eab..a10fbe7dfbf 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-1-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-1-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-2-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-2-Chromium-linux.png index 74b9e854205..f35d86c2c27 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-2-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-2-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-3-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-3-Chromium-linux.png index 86dbf852c18..0087b72aa2c 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-3-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-3-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-4-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-4-Chromium-linux.png index 730dc3076fc..867937795a7 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-4-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-custom-layout-4-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-focus-on-presentation-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-focus-on-presentation-Chromium-linux.png index 758c37e4f12..1005659de09 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-focus-on-presentation-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-focus-on-presentation-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-grid-layout-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-grid-layout-Chromium-linux.png index daa94afcc73..5f1297c84c3 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-grid-layout-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-grid-layout-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-smart-layout-1-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-smart-layout-1-Chromium-linux.png index f08a4aa4742..09f72fcc57e 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-smart-layout-1-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-smart-layout-1-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-smart-layout-2-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-smart-layout-2-Chromium-linux.png index c827c808a41..39a1781a73d 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-smart-layout-2-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-smart-layout-2-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-update-everyone-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-update-everyone-Chromium-linux.png index b0820be8a2f..a8abee212a1 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-update-everyone-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/moderator-update-everyone-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-1-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-1-Chromium-linux.png index f96f8d19ccf..172a1e6894d 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-1-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-1-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-2-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-2-Chromium-linux.png index 38ed501453e..172a1e6894d 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-2-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-2-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-3-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-3-Chromium-linux.png index 38ed501453e..172a1e6894d 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-3-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-3-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-4-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-4-Chromium-linux.png index 38ed501453e..172a1e6894d 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-4-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-custom-layout-4-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-focus-on-presentation-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-focus-on-presentation-Chromium-linux.png index f96f8d19ccf..7017caae18a 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-focus-on-presentation-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-focus-on-presentation-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-grid-layout-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-grid-layout-Chromium-linux.png index e9833515823..4989055f336 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-grid-layout-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-grid-layout-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-smart-layout-1-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-smart-layout-1-Chromium-linux.png index 9802b5630e4..22109e6fac5 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-smart-layout-1-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-smart-layout-1-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-smart-layout-2-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-smart-layout-2-Chromium-linux.png index 48fb1d5dd0e..22109e6fac5 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-smart-layout-2-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-smart-layout-2-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-update-everyone-Chromium-linux.png b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-update-everyone-Chromium-linux.png index 556109167e6..cc661278484 100644 Binary files a/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-update-everyone-Chromium-linux.png and b/bigbluebutton-tests/playwright/layouts/layouts.spec.js-snapshots/user-update-everyone-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/layouts/util.js b/bigbluebutton-tests/playwright/layouts/util.js index 9a2ab49f0aa..70678a60cf2 100644 --- a/bigbluebutton-tests/playwright/layouts/util.js +++ b/bigbluebutton-tests/playwright/layouts/util.js @@ -12,14 +12,18 @@ async function reopenChatSidebar(page) { } async function checkScreenshots(layoutTest, description, maskedSelectors, screenshotName, screenshotNumber) { - const modPageWebcamsLocator = layoutTest.modPage.getLocator(maskedSelectors); + const getMaskedLocators = (page) => Array.isArray(maskedSelectors) + ? maskedSelectors.map(selector => page.getLocator(selector)) + : [page.getLocator(maskedSelectors)]; + + const modPageMaskedSelectors = getMaskedLocators(layoutTest.modPage); await expect(layoutTest.modPage.page, description).toHaveScreenshot(`moderator-${screenshotName}${screenshotNumber ? '-' + screenshotNumber : ''}.png`, { - mask: [modPageWebcamsLocator], + mask: modPageMaskedSelectors, }); - const userWebcamsLocator = layoutTest.userPage.getLocator(maskedSelectors); + const userPageMaskedSelectors = getMaskedLocators(layoutTest.userPage); await expect(layoutTest.userPage.page, description).toHaveScreenshot(`user-${screenshotName}${screenshotNumber ? '-' + screenshotNumber : ''}.png`, { - mask: [userWebcamsLocator], + mask: userPageMaskedSelectors, }); }