From 7fe0cf4ce496d0d54b85411d25926ca357f319c7 Mon Sep 17 00:00:00 2001 From: Anton B Date: Fri, 13 Sep 2024 16:25:57 -0300 Subject: [PATCH] test: correctly avoid all presentation notification toasts on unrelated tests - use customStyle to avoid notifications on "join" instead of "create" --- .../playwright/core/constants.js | 2 +- .../playwright/layouts/layouts.spec.js | 8 +- .../playwright/user/user.spec.js | 3 +- .../playwright/whiteboard/whiteboard.spec.js | 76 +++++++++---------- 4 files changed, 45 insertions(+), 44 deletions(-) diff --git a/bigbluebutton-tests/playwright/core/constants.js b/bigbluebutton-tests/playwright/core/constants.js index eae485d136..a0397c1764 100644 --- a/bigbluebutton-tests/playwright/core/constants.js +++ b/bigbluebutton-tests/playwright/core/constants.js @@ -23,4 +23,4 @@ exports.VIDEO_LOADING_WAIT_TIME = 15000; exports.UPLOAD_PDF_WAIT_TIME = 25000 * MULTIPLIER; exports.CUSTOM_MEETING_ID = 'custom-meeting'; -exports.PARAMETER_HIDE_PRESENTATION_TOAST = 'userdata-bbb_custom_style=.presentationUploaderToast{display: none;}.currentPresentationToast{display:none;}'; +exports.PARAMETER_HIDE_PRESENTATION_TOASTS = 'userdata-bbb_custom_style=.presentationUploaderToast,.currentPresentationToast{display: none;}'; diff --git a/bigbluebutton-tests/playwright/layouts/layouts.spec.js b/bigbluebutton-tests/playwright/layouts/layouts.spec.js index b30f06faee..e7ce13d1fc 100644 --- a/bigbluebutton-tests/playwright/layouts/layouts.spec.js +++ b/bigbluebutton-tests/playwright/layouts/layouts.spec.js @@ -1,10 +1,10 @@ const { test } = require('@playwright/test'); const { fullyParallel } = require('../playwright.config'); const { encodeCustomParams } = require('../parameters/util'); -const { PARAMETER_HIDE_PRESENTATION_TOAST } = require('../core/constants'); +const { PARAMETER_HIDE_PRESENTATION_TOASTS } = require('../core/constants'); const { Layouts } = require('./layouts'); -const hidePresentationToast = encodeCustomParams(PARAMETER_HIDE_PRESENTATION_TOAST); +const hidePresentationToast = encodeCustomParams(PARAMETER_HIDE_PRESENTATION_TOASTS); const CUSTOM_MEETING_ID = 'layout_management_meeting'; @@ -16,8 +16,8 @@ test.describe("Layout management", () => { test.beforeAll(async ({ browser }) => { const context = await browser.newContext(); const page = await context.newPage(); - await layouts.initModPage(page, true, { createParameter: hidePresentationToast, customMeetingId: CUSTOM_MEETING_ID }); - await layouts.initUserPage(true, context, { createParameter: hidePresentationToast }); + await layouts.initModPage(page, true, { joinParameter: hidePresentationToast, customMeetingId: CUSTOM_MEETING_ID }); + await layouts.initUserPage(true, context, { joinParameter: hidePresentationToast }); await layouts.modPage.shareWebcam(); await layouts.userPage.shareWebcam(); }); diff --git a/bigbluebutton-tests/playwright/user/user.spec.js b/bigbluebutton-tests/playwright/user/user.spec.js index e8eaa33486..c1bee7467e 100644 --- a/bigbluebutton-tests/playwright/user/user.spec.js +++ b/bigbluebutton-tests/playwright/user/user.spec.js @@ -1,5 +1,6 @@ const { test, devices } = require('@playwright/test'); const { encodeCustomParams } = require('../parameters/util'); +const { PARAMETER_HIDE_PRESENTATION_TOASTS } = require('../core/constants'); const { Status } = require('./status'); const { MultiUsers } = require('./multiusers'); const { GuestPolicy } = require('./guestPolicy'); @@ -9,7 +10,7 @@ const { Timer } = require('./timer'); const motoG4 = devices['Moto G4']; const iPhone11 = devices['iPhone 11']; -const customStyleAvoidNotificationToasts = encodeCustomParams(`userdata-bbb_custom_style=.presentationUploaderToast,.currentPresentationToast{display: none;}`); +const customStyleAvoidNotificationToasts = encodeCustomParams(PARAMETER_HIDE_PRESENTATION_TOASTS); test.describe.parallel('User', () => { test.describe.parallel('Actions', () => { diff --git a/bigbluebutton-tests/playwright/whiteboard/whiteboard.spec.js b/bigbluebutton-tests/playwright/whiteboard/whiteboard.spec.js index a530a6e16e..7d9ea54c37 100644 --- a/bigbluebutton-tests/playwright/whiteboard/whiteboard.spec.js +++ b/bigbluebutton-tests/playwright/whiteboard/whiteboard.spec.js @@ -12,7 +12,7 @@ const { Eraser } = require('./eraser'); const { DrawArrow } = require('./drawArrow'); const { MultiUsers } = require('../user/multiusers'); const { encodeCustomParams } = require('../parameters/util'); -const { PARAMETER_HIDE_PRESENTATION_TOAST } = require('../core/constants'); +const { PARAMETER_HIDE_PRESENTATION_TOASTS } = require('../core/constants'); const { DeleteDrawing } = require('./deleteDrawing'); const { UndoDrawing } = require('./undoDraw'); const { RedoDrawing } = require('./redoDraw'); @@ -20,7 +20,7 @@ const { ChangeStyles } = require('./changeStyles'); const { RealTimeText } = require('./realTimeText'); const { ShapeOptions } = require('./shapeOptions'); -const hidePresentationToast = encodeCustomParams(PARAMETER_HIDE_PRESENTATION_TOAST); +const hidePresentationToast = encodeCustomParams(PARAMETER_HIDE_PRESENTATION_TOASTS); test.describe.parallel('Whiteboard @ci', () => { test('Draw rectangle', async ({ browser, page }) => { @@ -44,127 +44,127 @@ test.describe.parallel('Whiteboard tools - visual regression', () => { test('Draw rectangle', async ({ browser, context, page }) => { const drawRectangle = new DrawRectangle(browser, context); - await drawRectangle.initModPage(page, true, { customMeetingId: 'draw_rectangle_meeting', createParameter: hidePresentationToast }); - await drawRectangle.initUserPage(true, context, { createParameter: hidePresentationToast }); + await drawRectangle.initModPage(page, true, { customMeetingId: 'draw_rectangle_meeting', joinParameter: hidePresentationToast }); + await drawRectangle.initUserPage(true, context, { joinParameter: hidePresentationToast }); await drawRectangle.test(); }); test('Draw ellipse', async ({ browser, context, page }) => { const drawEllipse = new DrawEllipse(browser, context); - await drawEllipse.initModPage(page, true, { customMeetingId: 'draw_ellipse_meeting', createParameter: hidePresentationToast }); - await drawEllipse.initUserPage(true, context, { createParameter: hidePresentationToast }); + await drawEllipse.initModPage(page, true, { customMeetingId: 'draw_ellipse_meeting', joinParameter: hidePresentationToast }); + await drawEllipse.initUserPage(true, context, { joinParameter: hidePresentationToast }); await drawEllipse.test(); }); test('Draw triangle', async ({ browser, context, page }) => { const drawTriangle = new DrawTriangle(browser, context); - await drawTriangle.initModPage(page, true, { customMeetingId: 'draw_triangle_meeting', createParameter: hidePresentationToast }); - await drawTriangle.initUserPage(true, context, { createParameter: hidePresentationToast }); + await drawTriangle.initModPage(page, true, { customMeetingId: 'draw_triangle_meeting', joinParameter: hidePresentationToast }); + await drawTriangle.initUserPage(true, context, { joinParameter: hidePresentationToast }); await drawTriangle.test(); }); test('Draw line', async ({ browser, context, page }) => { const drawLine = new DrawLine(browser, context); - await drawLine.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await drawLine.initUserPage(true, context, { createParameter: hidePresentationToast }); + await drawLine.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await drawLine.initUserPage(true, context, { joinParameter: hidePresentationToast }); await drawLine.test(); }); test('Draw with pencil', async ({ browser, context, page }) => { const drawPencil = new DrawPencil(browser, context); - await drawPencil.initModPage(page, true, { customMeetingId: 'draw_pencil_meeting', createParameter: hidePresentationToast }); - await drawPencil.initUserPage(true, context, { createParameter: hidePresentationToast }); + await drawPencil.initModPage(page, true, { customMeetingId: 'draw_pencil_meeting', joinParameter: hidePresentationToast }); + await drawPencil.initUserPage(true, context, { joinParameter: hidePresentationToast }); await drawPencil.test(); }); test('Type text', async ({ browser, context, page }) => { const drawText = new DrawText(browser, context); - await drawText.initModPage(page, true, { customMeetingId: 'draw_text_meeting', createParameter: hidePresentationToast }); - await drawText.initUserPage(true, context, { createParameter: hidePresentationToast }); + await drawText.initModPage(page, true, { customMeetingId: 'draw_text_meeting', joinParameter: hidePresentationToast }); + await drawText.initUserPage(true, context, { joinParameter: hidePresentationToast }); await drawText.test(); }); test('Create sticky note', async ({ browser, context, page }) => { const drawStickyNote = new DrawStickyNote(browser, context); - await drawStickyNote.initModPage(page, true, { customMeetingId: 'draw_sticky_meeting', createParameter: hidePresentationToast }); - await drawStickyNote.initUserPage(true, context, { createParameter: hidePresentationToast }); + await drawStickyNote.initModPage(page, true, { customMeetingId: 'draw_sticky_meeting', joinParameter: hidePresentationToast }); + await drawStickyNote.initUserPage(true, context, { joinParameter: hidePresentationToast }); await drawStickyNote.test(); }); test('Pan', async ({ browser, context, page }) => { const pan = new Pan(browser, context); - await pan.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await pan.initUserPage(true, context, { createParameter: hidePresentationToast }); + await pan.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await pan.initUserPage(true, context, { joinParameter: hidePresentationToast }); await pan.test(); }); test('Eraser', async ({ browser, context, page }) => { const eraser = new Eraser(browser, context); - await eraser.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await eraser.initUserPage(true, context, { createParameter: hidePresentationToast }); + await eraser.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await eraser.initUserPage(true, context, { joinParameter: hidePresentationToast }); await eraser.test(); }); test('Draw arrow', async ({ browser, context, page }) => { const drawArrow = new DrawArrow(browser, context); - await drawArrow.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await drawArrow.initUserPage(true, context, { createParameter: hidePresentationToast }); + await drawArrow.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await drawArrow.initUserPage(true, context, { joinParameter: hidePresentationToast }); await drawArrow.test(); }); test('Delete drawing', async ({ browser, context, page }) => { const deleteDrawing = new DeleteDrawing(browser, context); - await deleteDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await deleteDrawing.initUserPage(true, context, { createParameter: hidePresentationToast }); + await deleteDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await deleteDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast }); await deleteDrawing.test(); }); test('Undo drawing', async ({ browser, context, page }) => { const undoDrawing = new UndoDrawing(browser, context); - await undoDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await undoDrawing.initUserPage(true, context, { createParameter: hidePresentationToast }); + await undoDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await undoDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast }); await undoDrawing.test(); }); test('Redo drawing', async ({ browser, context, page }) => { const redoDrawing = new RedoDrawing(browser, context); - await redoDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await redoDrawing.initUserPage(true, context, { createParameter: hidePresentationToast }); + await redoDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await redoDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast }); await redoDrawing.test(); }); test('Change color', async ({ browser, context, page }) => { const changeColor = new ChangeStyles(browser, context); - await changeColor.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await changeColor.initUserPage(true, context, { createParameter: hidePresentationToast }); + await changeColor.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await changeColor.initUserPage(true, context, { joinParameter: hidePresentationToast }); await changeColor.changingColor(); }); test('Fill drawing', async ({ browser, context, page }) => { const fillDrawing = new ChangeStyles(browser, context); - await fillDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await fillDrawing.initUserPage(true, context, { createParameter: hidePresentationToast }); + await fillDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await fillDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast }); await fillDrawing.fillDrawing(); }); test('Dash drawing', async ({ browser, context, page }) => { const dashDrawing = new ChangeStyles(browser, context); - await dashDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await dashDrawing.initUserPage(true, context, { createParameter: hidePresentationToast }); + await dashDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await dashDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast }); await dashDrawing.dashDrawing(); }); test('Size drawing', async ({ browser, context, page }) => { const sizeDrawing = new ChangeStyles(browser, context); - await sizeDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await sizeDrawing.initUserPage(true, context, { createParameter: hidePresentationToast }); + await sizeDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await sizeDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast }); await sizeDrawing.sizeDrawing(); }); test('Real time text typing', async ({ browser, context, page }) => { const realTimeText = new RealTimeText(browser, context); - await realTimeText.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast }); - await realTimeText.initUserPage(true, context, { createParameter: hidePresentationToast }); + await realTimeText.initModPage(page, true, { customMeetingId: 'draw_line_meeting', joinParameter: hidePresentationToast }); + await realTimeText.initUserPage(true, context, { joinParameter: hidePresentationToast }); await realTimeText.realTimeTextTyping(); });