diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/raise-hand-button/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/raise-hand-button/component.jsx index 30d1206a10d9..3dc16f94bcdf 100644 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/raise-hand-button/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/raise-hand-button/component.jsx @@ -46,7 +46,7 @@ const RaiseHandButton = (props) => { return ( >nth=0`, e.raisingHandToast); - await this.modPage.hasText(`${e.smallToastMsg}>>nth=1`, e.loweringHandToast); + await this.modPage.closeAllToastNotifications(); + await this.modPage.waitAndClick(e.lowerHandBtn); + await this.modPage.wasRemoved(e.raiseHandRejection, 'should remove the toast notification with the raise hand rejection button'); + await util.checkNotificationText(this.modPage, e.loweringHandToast); } async userJoinNotification(page) { diff --git a/bigbluebutton-tests/playwright/notifications/notifications.spec.js b/bigbluebutton-tests/playwright/notifications/notifications.spec.js index 00b20d2aea57..59592409438f 100644 --- a/bigbluebutton-tests/playwright/notifications/notifications.spec.js +++ b/bigbluebutton-tests/playwright/notifications/notifications.spec.js @@ -87,8 +87,7 @@ test.describe.parallel('Notifications', { tag: '@ci' }, () => { test('Presentation upload notification', { tag: '@flaky' }, async ({ browser, context, page }) => { // uploader notification not displayed sometimes - // see https://github.com/bigbluebutton/bigbluebutton/issues/21321#issuecomment-2390301906 - linkIssue(21321); + linkIssue(21813); const presenterNotifications = new PresenterNotifications(browser, context); await presenterNotifications.initPages(page); await presenterNotifications.modPage.closeAllToastNotifications(); diff --git a/bigbluebutton-tests/playwright/presentation/presentation.js b/bigbluebutton-tests/playwright/presentation/presentation.js index 8d7edff6ff57..76e70a8dd620 100644 --- a/bigbluebutton-tests/playwright/presentation/presentation.js +++ b/bigbluebutton-tests/playwright/presentation/presentation.js @@ -456,7 +456,7 @@ class Presentation extends MultiUsers { await this.modPage.waitAndClick(e.resetZoomButton); await expect(resetZoomButtonLocator, 'should the reset zoom button to contain the text 100%').toContainText(/100%/); await expect(zoomOutButtonLocator, 'should the zoom out button to be disabled').toBeDisabled(); - await expect(wbBox).toHaveScreenshot('moderator1-zoom100.png'); + await expect(wbBox).toHaveScreenshot('moderator1-no-zoom.png'); } async selectSlide() { diff --git a/bigbluebutton-tests/playwright/presentation/presentation.spec.js b/bigbluebutton-tests/playwright/presentation/presentation.spec.js index a03908690358..c0e625d6cfff 100644 --- a/bigbluebutton-tests/playwright/presentation/presentation.spec.js +++ b/bigbluebutton-tests/playwright/presentation/presentation.spec.js @@ -82,7 +82,7 @@ test.describe.parallel('Presentation', { tag: '@ci' }, () => { // https://docs.bigbluebutton.org/2.6/release-tests.html#uploading-a-presentation-automated test('Upload single presentation', { tag: '@flaky' }, async ({ browser, context, page }) => { // current presentation toast not being displayed sometimes - linkIssue(21576); + linkIssue(21813); const presentation = new Presentation(browser, context); await presentation.initPages(page, true); await presentation.uploadSinglePresentationTest(); @@ -90,7 +90,6 @@ test.describe.parallel('Presentation', { tag: '@ci' }, () => { test('Upload Other Presentations Format', { tag: '@flaky' }, async ({ browser, context, page }) => { // file with wrong (not expected) ideogram conversion pushed, which is used for assertions - // see issue below linkIssue(18971); const presentation = new Presentation(browser, context); await presentation.initPages(page, true); @@ -100,7 +99,7 @@ test.describe.parallel('Presentation', { tag: '@ci' }, () => { // https://docs.bigbluebutton.org/2.6/release-tests.html#uploading-multiple-presentations-automated test('Upload multiple presentations', { tag: '@flaky' }, async ({ browser, context, page }) => { // current presentation toast not being displayed sometimes - linkIssue(21576); + linkIssue(21813); const presentation = new Presentation(browser, context); await presentation.initPages(page, true); await presentation.uploadMultiplePresentationsTest(); @@ -128,14 +127,16 @@ test.describe.parallel('Presentation', { tag: '@ci' }, () => { test('Upload and remove all presentations', { tag: '@flaky' }, async ({ browser, context, page }) => { // sometimes the uploaded presentation is not displayed in the manage presentations modal linkIssue(21624); + // current presentation toast not being displayed sometimes + linkIssue(21813); const presentation = new Presentation(browser, context); await presentation.initPages(page); await presentation.uploadAndRemoveAllPresentations(); }); test('Remove previous presentation from previous presenter', { tag: '@flaky' }, async ({ browser, context, page }) => { - // missing the uploader presentation toast notification in some CI runs - linkIssue(21576) + // current presentation toast not being displayed sometimes + linkIssue(21813); const presentation = new Presentation(browser, context); await presentation.initModPage(page, true); await presentation.initUserPage(true, context); diff --git a/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-no-zoom-Chromium-linux.png b/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-no-zoom-Chromium-linux.png index 9b7155cb0b99..49cdd45c76ef 100644 Binary files a/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-no-zoom-Chromium-linux.png and b/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-no-zoom-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom100-Chromium-linux.png b/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom100-Chromium-linux.png deleted file mode 100644 index 14503aae28a4..000000000000 Binary files a/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom100-Chromium-linux.png and /dev/null differ diff --git a/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom125-Chromium-linux.png b/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom125-Chromium-linux.png index 64e2a719b839..e52033979705 100644 Binary files a/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom125-Chromium-linux.png and b/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom125-Chromium-linux.png differ diff --git a/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom150-Chromium-linux.png b/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom150-Chromium-linux.png deleted file mode 100644 index 2a6edd803592..000000000000 Binary files a/bigbluebutton-tests/playwright/presentation/presentation.spec.js-snapshots/moderator1-zoom150-Chromium-linux.png and /dev/null differ diff --git a/bigbluebutton-tests/playwright/presentation/util.js b/bigbluebutton-tests/playwright/presentation/util.js index cd2e02bcfa58..e104e9c17bc1 100644 --- a/bigbluebutton-tests/playwright/presentation/util.js +++ b/bigbluebutton-tests/playwright/presentation/util.js @@ -36,7 +36,7 @@ async function uploadSinglePresentation(test, fileName, uploadTimeout = UPLOAD_P await test.hasText('body', e.statingUploadPresentationToast, 'should display the toast message uploading the presentation'); await test.waitAndClick(e.confirmManagePresentation); - await test.hasElement(e.presentationUploadProgressToast, 'should display the toast presentation upload progress after confirming the presentation to be uploaded', ELEMENT_WAIT_EXTRA_LONG_TIME); + await test.hasElement(e.presentationUploadProgressToast, 'should display the toast presentation upload progress after confirming the presentation to be uploaded'); await test.page.waitForFunction(([selector, firstSlideSrc]) => { const currentSrc = document.querySelector(selector) ?.style?.backgroundImage?.split('"')[1]; diff --git a/bigbluebutton-tests/playwright/user/lockViewers.js b/bigbluebutton-tests/playwright/user/lockViewers.js index c1cf837e55fc..0a31c3ad07d2 100644 --- a/bigbluebutton-tests/playwright/user/lockViewers.js +++ b/bigbluebutton-tests/playwright/user/lockViewers.js @@ -230,7 +230,9 @@ class LockViewers extends MultiUsers { await this.modPage.checkElementCount(e.whiteboardCursorIndicator, 1, 'should contain one whiteboard cursor indicator for the moderator'); await this.initUserPage2(true); - await this.userPage2.checkElementCount(e.whiteboardCursorIndicator, 0, 'should contain no whiteboard cursor indicator for the second attendee when locking viewers cursor'); + await this.userPage2.checkElementCount(e.whiteboardCursorIndicator, 0, + 'should contain no whiteboard cursor indicator for the second attendee when joining a meeting with the setting locked' + ); // Unlock user2 await this.modPage.waitAndClick(`${e.userListItem}>>nth=1`); diff --git a/bigbluebutton-tests/playwright/user/user.spec.js b/bigbluebutton-tests/playwright/user/user.spec.js index 512249797b41..557f01d511a9 100644 --- a/bigbluebutton-tests/playwright/user/user.spec.js +++ b/bigbluebutton-tests/playwright/user/user.spec.js @@ -219,8 +219,7 @@ test.describe.parallel('User', { tag: '@ci' }, () => { await lockViewers.lockSeeOtherViewersAnnotations(); }); - test('Lock see other viewers cursor', { tag: '@flaky' }, async ({ browser, context, page }) => { - // Unlocking specific user not working, see https://github.com/bigbluebutton/bigbluebutton/issues/21297 + test('Lock see other viewers cursor', async ({ browser, context, page }) => { const lockViewers = new LockViewers(browser, context); await lockViewers.initPages(page); await lockViewers.lockSeeOtherViewersCursor();