diff --git a/src/tests/Browser/Meet/RoomSecurityTest.php b/src/tests/Browser/Meet/RoomSecurityTest.php
--- a/src/tests/Browser/Meet/RoomSecurityTest.php
+++ b/src/tests/Browser/Meet/RoomSecurityTest.php
@@ -170,7 +170,8 @@
$guest->visit(new RoomPage('john'))
->waitFor('@setup-form')
->waitUntilMissing('@setup-status-message.loading')
- ->assertSeeIn('@setup-button:not([disabled]).btn-success', 'JOIN NOW')
+ ->assertButtonEnabled('@setup-button')
+ ->assertSeeIn('@setup-button.btn-success', 'JOIN NOW')
// try without the nickname
->click('@setup-button')
->waitFor('@setup-nickname-input.is-invalid')
@@ -179,12 +180,13 @@
"The room is locked. Please, enter your name and try again."
)
->assertMissing('@setup-password-input')
- ->assertSeeIn('@setup-button:not([disabled]).btn-success', 'JOIN NOW')
+ ->assertButtonEnabled('@setup-button')
+ ->assertSeeIn('@setup-button.btn-success', 'JOIN NOW')
->type('@setup-nickname-input', 'Guest')
->click('@setup-button')
->assertMissing('@setup-nickname-input.is-invalid')
- ->waitFor('@setup-button[disabled]')
- ->assertSeeIn('@setup-status-message', "Waiting for permission to join the room.");
+ ->waitForText("Waiting for permission to join the room.")
+ ->assertButtonDisabled('@setup-button');
// Test denying the request (this will also test custom toasts)
$owner
@@ -208,8 +210,8 @@
->waitUntilMissing('@setup-status-message.loading')
->type('@setup-nickname-input', 'guest')
->click('@setup-button')
- ->waitFor('@setup-button[disabled]')
- ->assertSeeIn('@setup-status-message', "Waiting for permission to join the room.");
+ ->waitForText("Waiting for permission to join the room.")
+ ->assertButtonDisabled('@setup-button');
$owner
->whenAvailable(new Toast(Toast::TYPE_CUSTOM), function ($browser) {
diff --git a/src/tests/Browser/Meet/RoomSetupTest.php b/src/tests/Browser/Meet/RoomSetupTest.php
--- a/src/tests/Browser/Meet/RoomSetupTest.php
+++ b/src/tests/Browser/Meet/RoomSetupTest.php
@@ -56,7 +56,7 @@
->assertMissing('@login-form')
->assertVisible('@setup-form')
->assertSeeIn('@setup-status-message', "The room does not exist.")
- ->assertVisible('@setup-button[disabled]');
+ ->assertButtonDisabled('@setup-button');
});
}
@@ -166,7 +166,10 @@
->assertSeeIn('@setup-status-message', "The room is closed. It will be open for others after you join.")
->assertSeeIn('@setup-button', "JOIN")
->type('@setup-nickname-input', 'john')
- // Join the room
+ // Join the room (click the button twice, to make sure it does not
+ // produce redundant participants/subscribers in the room)
+ ->click('@setup-button')
+ ->pause(10)
->click('@setup-button')
->waitFor('@session')
->assertMissing('@setup-form')
diff --git a/src/tests/Browser/Meet/RoomsTest.php b/src/tests/Browser/Meet/RoomsTest.php
--- a/src/tests/Browser/Meet/RoomsTest.php
+++ b/src/tests/Browser/Meet/RoomsTest.php
@@ -89,7 +89,7 @@
$browser->click('@links a.link-chat')
->waitFor('#meet-rooms')
->waitFor('.card-text a')
- ->assertSeeIn('.card-title', 'Video chat')
+ ->assertSeeIn('.card-title', 'Voice & Video Conferencing')
->assertSeeIn('.card-text a', $href)
->assertAttribute('.card-text a', 'href', $href)
->click('.card-text a')
diff --git a/src/tests/Browser/Pages/Meet/Room.php b/src/tests/Browser/Pages/Meet/Room.php
--- a/src/tests/Browser/Pages/Meet/Room.php
+++ b/src/tests/Browser/Pages/Meet/Room.php
@@ -68,7 +68,7 @@
'@setup-volume' => '#setup-preview .volume',
'@setup-video' => '#setup-preview video',
'@setup-status-message' => '#meet-setup div.status-message',
- '@setup-button' => '#meet-setup form button',
+ '@setup-button' => '#join-button',
'@toolbar' => '#meet-session-toolbar',