Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove browser checks that are no longer applicable. #605

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove browser checks that are no longer applicable. #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b42ff2
Remove browser checks that are no longer applicable.
jallamsetty1 Jun 20, 2023
7a096d0
Enable test - muteAfterJoinCanShareAndUnmute and remove firefox check.
jallamsetty1 Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/test/java/org/jitsi/meet/test/AvatarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,6 @@ public void avatarWhenVideoMuted()
@Test(dependsOnMethods = { "avatarWhenVideoMuted" })
public void testEmailPersistence()
{
// This test is very often failing on FF (due to a crash on hangup
// present in FF57)
// will disable it for now
if (getParticipant1().getType().isFirefox())
{
return;
}

getParticipant1().getToolbar().clickProfileButton();

String currentEmailValue
Expand Down
64 changes: 29 additions & 35 deletions src/test/java/org/jitsi/meet/test/MuteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,8 @@ public void muteParticipant1BeforeParticipant2Joins()

/**
* Run muteAfterJoinCanShareAndUnmute in both p2p and jvb mode.
* Disabled for now as it fails from time to time.
*/
//@Test(dependsOnMethods = {"muteParticipant1BeforeParticipant2Joins"})
@Test(dependsOnMethods = {"muteParticipant1BeforeParticipant2Joins"})
public void muteAfterJoinCanShareAndUnmute()
{
muteParticipant1BeforeParticipant2JoinsAndScreenshare("true");
Expand All @@ -247,42 +246,37 @@ private void muteParticipant1BeforeParticipant2JoinsAndScreenshare(String enable
getParticipant1().getToolbar().clickVideoMuteButton();

WebParticipant participant1 = getParticipant1();
WebParticipant participant2 = joinSecondParticipant(url2);
participant2.waitToJoinMUC();

// Skip the test in p2p mode for Firefox since p2p is disabled in code for Firefox.
if (!participant1.getType().isFirefox() || enableP2p.equals("false"))
// Wait for the media to switch over to the p2p connection in the p2p test.
if (enableP2p.equals("true"))
{
WebParticipant participant2 = joinSecondParticipant(url2);
participant2.waitToJoinMUC();

// Wait for the media to switch over to the p2p connection in the p2p test.
if (enableP2p.equals("true"))
{
MeetUtils.waitForP2PIceConnected(participant2.getDriver());
}
else
{
participant2.waitForIceConnected();
}
participant2.waitForSendReceiveData(true, false);

// Check if p1 appears video muted on p2.
participant2.getParticipantsPane().assertIsParticipantVideoMuted(participant1, true);

// Start desktop share.
participant1.getToolbar().clickDesktopSharingButton();

// Check if a remote screenshare tile is created on p2.
DesktopSharingTest.checkForScreensharingTile(participant1, participant2, true, 5);
MeetUIUtils.waitForRemoteVideo(participant2.getDriver(), participant1.getEndpointId(), true);

// Stop desktop share and unmute video and check for video again.
participant1.getToolbar().clickStopDesktopSharingButton();

participant2.getParticipantsPane().assertIsParticipantVideoMuted(participant1, true);
participant1.getToolbar().clickVideoUnmuteButton();
participant2.getParticipantsPane().assertIsParticipantVideoMuted(participant1, false);
MeetUIUtils.waitForRemoteVideo(participant2.getDriver(), participant1.getEndpointId(), true);
MeetUtils.waitForP2PIceConnected(participant2.getDriver());
}
else
{
participant2.waitForIceConnected();
}
participant2.waitForSendReceiveData(true, false);

// Check if p1 appears video muted on p2.
participant2.getParticipantsPane().assertIsParticipantVideoMuted(participant1, true);

// Start desktop share.
participant1.getToolbar().clickDesktopSharingButton();

// Check if a remote screenshare tile is created on p2.
DesktopSharingTest.checkForScreensharingTile(participant1, participant2, true, 5);
MeetUIUtils.waitForRemoteVideo(participant2.getDriver(), participant1.getEndpointId(), true);

// Stop desktop share and unmute video and check for video again.
participant1.getToolbar().clickStopDesktopSharingButton();

participant2.getParticipantsPane().assertIsParticipantVideoMuted(participant1, true);
participant1.getToolbar().clickVideoUnmuteButton();
participant2.getParticipantsPane().assertIsParticipantVideoMuted(participant1, false);
MeetUIUtils.waitForRemoteVideo(participant2.getDriver(), participant1.getEndpointId(), true);
}

/**
Expand Down
11 changes: 0 additions & 11 deletions src/test/java/org/jitsi/meet/test/StartMutedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,6 @@ public void startWithVideoMutedCanUnmute()
ParticipantType participant1Type = participant1.getType();
ParticipantType participant2Type = participant2.getType();


// Firefox is known to have problems unmuting when starting muted.
// Safari does not support video.
if (participant1Type.isFirefox()
|| participant2Type.isFirefox()
|| participant1Type.isSafari()
|| participant2Type.isSafari())
{
return;
}

hangUpAllParticipants();

// Explicitly enable P2P due to a regression with unmute not updating
Expand Down