BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "changed from createparamter to joinparameter"

Browse Source 
This reverts commit bc0082d947.
This commit is contained in:
Gabriel Porfirio 2024-03-21 10:09:25 -03:00
parent bc0082d947
commit cd13a8d3e9
7 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-tests/playwright/options/options.js
View File

@ -50,6 +50,7 @@ class Options extends MultiUsers {
const langDropdown = await this.modPage.page.$(e.languageSelector);
await langDropdown.selectOption({ value: locale });
await this.modPage.waitAndClick(e.modalConfirmButton);
await this.modPage.waitForSelector(e.toastContainer);
for (const selector in currentValuesBySelector) {
await this.modPage.hasText(selector, currentValuesBySelector[selector]);
@ -71,6 +72,7 @@ class Options extends MultiUsers {
maxDiffPixels: 1000,
};
await this.modPage.closeAllToastNotifications();
await expect(modPageLocator).toHaveScreenshot('moderator-page-dark-mode.png', screenshotOptions);
await openSettings(this.modPage);

2
bigbluebutton-tests/playwright/options/options.spec.js
View File

@ -12,7 +12,7 @@ test.describe('Options', () => {
test.describe.configure({ mode: fullyParallel ? 'parallel' : 'serial' });
test[fullyParallel ? 'beforeEach' : 'beforeAll'](async ({ browser }) => {
await initializePages(options, browser, { joinParameter: hidePresentationToast });
await initializePages(options, browser, { createParameter: hidePresentationToast });
});
test('Open about modal', async () => {

2
bigbluebutton-tests/playwright/parameters/customparameters.js
View File

@ -102,6 +102,7 @@ class CustomParameters extends MultiUsers {
async skipCheckOnFirstJoin() {
await this.modPage.waitAndClick(e.microphoneButton, ELEMENT_WAIT_LONGER_TIME);
await this.modPage.hasElement(e.establishingAudioLabel);
await this.modPage.hasElement(e.smallToastMsg);
await this.modPage.hasElement(e.isTalking);
await this.modPage.leaveAudio();
await this.modPage.waitAndClick(e.joinAudio);
@ -150,6 +151,7 @@ class CustomParameters extends MultiUsers {
const { presentationHidden,pollEnabled } = getSettings();
if (!presentationHidden) await this.userPage.waitAndClick(e.minimizePresentation);
if (pollEnabled) await util.poll(this.modPage, this.userPage);
await this.userPage.waitForSelector(e.smallToastMsg);
await this.userPage.checkElement(e.restorePresentation);
}

6
bigbluebutton-tests/playwright/parameters/parameters.spec.js
View File

@ -454,7 +454,7 @@ test.describe.parallel('Custom Parameters', () => {
test('Skip audio check on first join', async ({ browser, context, page }) => {
const customParam = new CustomParameters(browser, context);
await customParam.initModPage(page, false, { joinParameter: `${hidePresentationToast}&${c.skipCheckOnFirstJoin}` });
await customParam.initModPage(page, false, { createParameter: hidePresentationToast, joinParameter: c.skipCheckOnFirstJoin });
await customParam.skipCheckOnFirstJoin();
});
});
@ -477,8 +477,8 @@ test.describe.parallel('Custom Parameters', () => {
test('Force Restore Presentation On New Poll Result', async ({ browser, context, page }) => {
const customParam = new CustomParameters(browser, context);
const joinParameter = `${c.forceRestorePresentationOnNewEvents}&${hidePresentationToast}`;
await customParam.initModPage(page, true, joinParameter );
const joinParameter = c.forceRestorePresentationOnNewEvents;
await customParam.initModPage(page, true, { createParameter: hidePresentationToast, joinParameter });
await customParam.forceRestorePresentationOnNewPollResult(joinParameter);
});
});

1
bigbluebutton-tests/playwright/user/status.js
View File

@ -13,6 +13,7 @@ class Status extends Page {
async changeUserStatus() {
const { userStatusEnabled } = getSettings();
await waitAndClearDefaultPresentationNotification(this);
if(!userStatusEnabled) {
await this.waitAndClick(e.currentUser);
return this.wasRemoved(e.setStatus);

6
bigbluebutton-tests/playwright/user/user.spec.js
View File

@ -39,7 +39,7 @@ test.describe.parallel('User', () => {
// https://docs.bigbluebutton.org/2.6/release-tests.html#set-status--raise-hand-automated
test('Change user status @ci', async ({ browser, page }) => {
const status = new Status(browser, page);
await status.init(true, true, { joinParameter: hidePresentationToast });
await status.init(true, true, { createParameter: hidePresentationToast });
await status.changeUserStatus();
});
@ -212,8 +212,8 @@ test.describe.parallel('User', () => {
test('Lock see other viewers annotations', async ({ browser, context, page }) => {
const lockViewers = new LockViewers(browser, context);
await lockViewers.initModPage(page, true, { joinParameter: hidePresentationToast });
await lockViewers.initUserPage(true, context, { joinParameter: hidePresentationToast });
await lockViewers.initModPage(page, true, { createParameter: hidePresentationToast });
await lockViewers.initUserPage(true, context, { createParameter: hidePresentationToast });
await lockViewers.lockSeeOtherViewersAnnotations();
});

72
bigbluebutton-tests/playwright/whiteboard/whiteboard.spec.js
View File

@ -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', joinParameter: hidePresentationToast });
await drawRectangle.initUserPage(true, context, { joinParameter: hidePresentationToast });
await drawRectangle.initModPage(page, true, { customMeetingId: 'draw_rectangle_meeting', createParameter: hidePresentationToast });
await drawRectangle.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await drawEllipse.initUserPage(true, context, { joinParameter: hidePresentationToast });
await drawEllipse.initModPage(page, true, { customMeetingId: 'draw_ellipse_meeting', createParameter: hidePresentationToast });
await drawEllipse.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await drawTriangle.initUserPage(true, context, { joinParameter: hidePresentationToast });
await drawTriangle.initModPage(page, true, { customMeetingId: 'draw_triangle_meeting', createParameter: hidePresentationToast });
await drawTriangle.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await drawLine.initUserPage(true, context, { joinParameter: hidePresentationToast });
await drawLine.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await drawLine.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await drawPencil.initUserPage(true, context, { joinParameter: hidePresentationToast });
await drawPencil.initModPage(page, true, { customMeetingId: 'draw_pencil_meeting', createParameter: hidePresentationToast });
await drawPencil.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await drawText.initUserPage(true, context, { joinParameter: hidePresentationToast });
await drawText.initModPage(page, true, { customMeetingId: 'draw_text_meeting', createParameter: hidePresentationToast });
await drawText.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await drawStickyNote.initUserPage(true, context, { joinParameter: hidePresentationToast });
await drawStickyNote.initModPage(page, true, { customMeetingId: 'draw_sticky_meeting', createParameter: hidePresentationToast });
await drawStickyNote.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await pan.initUserPage(true, context, { joinParameter: hidePresentationToast });
await pan.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await pan.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await eraser.initUserPage(true, context, { joinParameter: hidePresentationToast });
await eraser.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await eraser.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await drawArrow.initUserPage(true, context, { joinParameter: hidePresentationToast });
await drawArrow.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await drawArrow.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await deleteDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast });
await deleteDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await deleteDrawing.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await undoDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast });
await undoDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await undoDrawing.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await redoDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast });
await redoDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await redoDrawing.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await changeColor.initUserPage(true, context, { joinParameter: hidePresentationToast });
await changeColor.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await changeColor.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await fillDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast });
await fillDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await fillDrawing.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await dashDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast });
await dashDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await dashDrawing.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await sizeDrawing.initUserPage(true, context, { joinParameter: hidePresentationToast });
await sizeDrawing.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await sizeDrawing.initUserPage(true, context, { createParameter: 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', joinParameter: hidePresentationToast });
await realTimeText.initUserPage(true, context, { joinParameter: hidePresentationToast });
await realTimeText.initModPage(page, true, { customMeetingId: 'draw_line_meeting', createParameter: hidePresentationToast });
await realTimeText.initUserPage(true, context, { createParameter: hidePresentationToast });
await realTimeText.realTimeTextTyping();
});