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

avoid using static timeouts and fix Random Poll test

Browse Source
This commit is contained in:
Anton Barboza 2021-09-22 13:51:35 -03:00
parent ae21124005
commit dce318e1ad
6 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-html5/imports/ui/components/screenshare/component.jsx
View File

@ -269,7 +269,7 @@ class ScreenshareComponent extends React.Component {
{
isGloballyBroadcasting
? (
<div>
<div data-test="isSharingScreen">
{!switched
&& ScreenshareComponent.renderScreenshareContainerInside(
intl.formatMessage(intlMessages.presenterSharingLabel),

1
bigbluebutton-tests/puppeteer/chat/util.js
View File

@ -17,7 +17,6 @@ async function sendPublicChatMessage(page1, page2) {
async function openPrivateChatMessage(page1, page2) {
// Open private Chat with the other User
Object.values(arguments).forEach(async argument => await argument.waitForSelector(e.userListItem));
await page1.waitAndClick(e.userListItem);
await page2.waitAndClick(e.userListItem);
await page1.waitAndClick(e.activeChat);

2
bigbluebutton-tests/puppeteer/core/elements.js
View File

@ -3,6 +3,7 @@ exports.actions = 'button[aria-label="Actions"]';
exports.options = 'button[aria-label="Options"]';
exports.screenshareConnecting = 'div[data-test="screenshareConnecting"]';
exports.screenShareVideo = 'video[id="screenshareVideo"]';
exports.isSharingScreen = 'div[data-test="isSharingScreen"]';
exports.raiseHandLabel = 'button[data-test="raiseHandLabel"]';
exports.lowerHandLabel = 'button[data-test="lowerHandLabel"]';
exports.logout = 'li[data-test="logout"]';
@ -137,6 +138,7 @@ exports.startPoll = 'button[data-test="startPoll"]';
exports.restartPoll = 'button[data-test="restartPoll"]';
exports.receivedAnswer = 'td[data-test="receivedAnswer"]';
exports.publishLabel = 'button[data-test="publishLabel"]';
exports.pollResults = 'g[data-test="pollResultAria"]';
// Presentation
exports.startScreenSharing = 'button[data-test="startScreenShare"]';

10
bigbluebutton-tests/puppeteer/screenshare/screenshare.js
View File

@ -13,11 +13,11 @@ class ShareScreen extends Page {
async test() {
try {
await util.startScreenshare(this);
await this.page.waitForSelector(e.screenshareConnecting);
await this.page.waitForSelector(e.screenShareVideo, VIDEO_LOADING_WAIT_TIME);
await sleep(5000);
const response = await util.getScreenShareContainer(this);
return response;
await this.waitForSelector(e.screenshareConnecting);
await this.waitForSelector(e.screenShareVideo, VIDEO_LOADING_WAIT_TIME);
const response = await this.hasElement(e.isSharingScreen, true);
return response === true;
} catch (err) {
await this.logger(err);
return false;

6
bigbluebutton-tests/puppeteer/screenshare/util.js
View File

@ -11,11 +11,6 @@ async function waitForScreenshareContainer(test) {
await test.waitForSelector(e.screenShareVideo, VIDEO_LOADING_WAIT_TIME);
}
async function getScreenShareContainer(test) {
await test.waitForSelector(e.screenShareVideo, VIDEO_LOADING_WAIT_TIME);
return test.page.evaluate(checkElement, e.screenShareVideo);
}
async function getScreenShareBreakoutContainer(test) {
await test.waitForSelector(e.screenshareConnecting, VIDEO_LOADING_WAIT_TIME);
await test.waitForSelector(e.screenShareVideo, VIDEO_LOADING_WAIT_TIME);
@ -23,6 +18,5 @@ async function getScreenShareBreakoutContainer(test) {
}
exports.getScreenShareBreakoutContainer = getScreenShareBreakoutContainer;
exports.getScreenShareContainer = getScreenShareContainer;
exports.startScreenshare = startScreenshare;
exports.waitForScreenshareContainer = waitForScreenshareContainer;

46
bigbluebutton-tests/puppeteer/user/multiusers.js
View File

@ -50,11 +50,12 @@ class MultiUsers {
async multiUsersPrivateChat() {
try {
await util.openPrivateChatMessage(this.page1, this.page2);
const chat0 = await this.page1.page.evaluate(getElementLength, e.chatUserMessageText);
const chat0 = await this.page1.page.evaluate(checkElementLengthEqualTo, e.chatUserMessageText, 0);
await util.sendPrivateChatMessage(this.page1, this.page2);
await sleep(2000);
const chat1 = await this.page1.page.evaluate(getElementLength, e.chatUserMessageText);
return chat0 !== chat1;
const receivedMessages = await this.page1.hasElement(e.chatUserMessageText, true) && await this.page2.hasElement(e.chatUserMessageText, true);
return chat0 && receivedMessages;
} catch (err) {
await this.page1.logger(err);
return false;
@ -129,7 +130,6 @@ class MultiUsers {
case 3:
// Do nothing to let Users write their single response answer
await this.page1.waitForSelector(e.responseChoices);
await sleep(2000);
break;
}
const condition = chosenRandomNb === 0 || chosenRandomNb === 1 || chosenRandomNb === 2;
@ -137,7 +137,7 @@ class MultiUsers {
await this.page2.waitForSelector(e.pollingContainer);
switch (condition) {
case true:
await this.page2.clickNItem(e.pollAnswerOptionBtn, true, 2);
await this.page2.clickNItem(e.pollAnswerOptionBtn, false, 2);
break;
case false:
await this.page2.page.focus(e.pollAnswerOptionInput);
@ -145,10 +145,11 @@ class MultiUsers {
await this.page2.waitAndClick(e.pollSubmitAnswer);
break;
}
await this.page1.waitAndClick(e.publishLabel);
const receivedAnswerFound = await this.page1.hasElement(e.receivedAnswer, true);
await this.page1.waitAndClick(e.publishLabel, ELEMENT_WAIT_TIME, true);
await this.page1.waitForSelector(e.restartPoll);
const receivedAnswerFound = await this.page1.page.evaluate(checkElementLengthDifferentTo, e.receivedAnswer, 0);
return receivedAnswerFound;
const isPollResultsPublished = await this.page1.hasElement(e.pollResults, true);
return receivedAnswerFound && isPollResultsPublished;
} catch (err) {
await this.page1.logger(err);
return false;
@ -163,7 +164,7 @@ class MultiUsers {
await this.page1.waitForSelector(e.whiteboard);
await this.page1.clickNItem(e.userListItem, true, 1);
await this.page1.clickNItem(e.changeWhiteboardAccess, true, 1);
await sleep(2000);
await this.page1.waitForSelector(e.multiWhiteboardTool);
const resp = await this.page1.page.evaluate((multiWhiteboardTool) => {
return document.querySelector(multiWhiteboardTool).children[0].innerText === '1';
}, e.multiWhiteboardTool);
@ -180,8 +181,8 @@ class MultiUsers {
await this.page1.closeAudioModal();
await this.page2.closeAudioModal();
await this.page2.waitAndClick(e.raiseHandLabel);
await sleep(2000);
const resp = await this.page2.page.evaluate(checkElementLengthDifferentTo, e.lowerHandLabel, 0);
const resp = await this.page2.hasElement(e.lowerHandLabel, true);
return resp === true;
} catch (err) {
await this.page1.logger(err);
@ -193,8 +194,9 @@ class MultiUsers {
async lowerHandTest() {
try {
await this.page2.waitAndClick(e.lowerHandLabel);
await sleep(2000);
const resp = await this.page2.page.evaluate(checkElementLengthDifferentTo, e.raiseHandLabel, 0);
await this.page2.waitAndClick(e.lowerHandLabel, ELEMENT_WAIT_TIME, true);
const resp = await this.page2.hasElement(e.raiseHandLabel, true);
return resp === true;
} catch (err) {
await this.page2.logger(err);
@ -220,14 +222,12 @@ class MultiUsers {
await this.page2.closeAudioModal();
await this.page2.page.evaluate(() => window.dispatchEvent(new CustomEvent('socketstats', { detail: { rtt: 2000 } })));
await this.page2.page.setOfflineMode(true);
await sleep(3000);
await this.page2.close();
await sleep(5000);
await utilUser.connectionStatus(this.page1);
await sleep(5000);
const connectionStatusItemEmpty = await this.page1.page.evaluate(checkElementLengthEqualTo, e.connectionStatusItemEmpty, 0);
const connectionStatusOfflineUser = await this.page1.page.evaluate(checkElementLengthDifferentTo, e.connectionStatusOfflineUser, 0) === true;
return connectionStatusOfflineUser && connectionStatusItemEmpty;
const connectionStatusItemEmpty = await this.page1.wasRemoved(e.connectionStatusItemEmpty);
const connectionStatusOfflineUser = await this.page1.hasElement(e.connectionStatusOfflineUser, true);
return connectionStatusItemEmpty && connectionStatusOfflineUser;
} catch (err) {
await this.page1.logger(err);
return false;
@ -255,8 +255,8 @@ class MultiUsers {
await this.page2.waitAndClick(e.userListButton);
await this.page2.waitAndClick(e.chatButtonKey);
const onUserListPanel = await this.page1.isNotVisible(e.hidePresentation);
const onChatPanel = await this.page2.page.evaluate(checkElementLengthEqualTo, e.hidePresentation, 0);
await sleep(2000);
const onChatPanel = await this.page2.isNotVisible(e.hidePresentation);
return onUserListPanel && onChatPanel;
} catch (err) {
await this.page1.logger(err);
@ -272,7 +272,7 @@ class MultiUsers {
await this.page2.waitAndClick(e.chatButtonKey);
const whiteboard = await this.page1.page.evaluate(checkElementLengthEqualTo, e.chatButtonKey, 0);
const onChatPanel = await this.page2.isNotVisible(e.chatButtonKey);
await sleep(2000);
return whiteboard && onChatPanel;
} catch (err) {
await this.page1.logger(err);