Rename lobby constants

The lobby constants were named from the point of view of the webinary
(open to all participants, open to moderators only), but from the point
of view of the lobby it is the opposite (no lobby, lobby for non
moderators).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

4 files changed, 37 insertions, 37 deletions

diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index 32382cd16..1c8ce26c9 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -490,9 +490,9 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	 * @param TableNode
 	 */
 	public function userSetsLobbyStateForRoomTo($user, $identifier, $lobbyState, $statusCode) {
-		if ($lobbyState === 'all participants') {
+		if ($lobbyState === 'no lobby') {
 			$lobbyState = 0;
-		} else if ($lobbyState === 'moderators only') {
+		} else if ($lobbyState === 'non moderators') {
 			$lobbyState = 1;
 		}
 
diff --git a/tests/integration/features/conversation/lobby.feature b/tests/integration/features/conversation/lobby.feature
index eef88117c..c48a013e7 100644
--- a/tests/integration/features/conversation/lobby.feature
+++ b/tests/integration/features/conversation/lobby.feature
@@ -13,12 +13,12 @@ Feature: conversation/lobby
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" adds "participant3" to room "room" with 200
-    When user "participant1" sets lobby state for room "room" to "moderators only" with 200
-    And user "participant1" sets lobby state for room "room" to "all participants" with 200
-    And user "participant2" sets lobby state for room "room" to "moderators only" with 200
-    And user "participant2" sets lobby state for room "room" to "all participants" with 200
-    And user "participant3" sets lobby state for room "room" to "moderators only" with 403
-    And user "participant3" sets lobby state for room "room" to "all participants" with 403
+    When user "participant1" sets lobby state for room "room" to "non moderators" with 200
+    And user "participant1" sets lobby state for room "room" to "no lobby" with 200
+    And user "participant2" sets lobby state for room "room" to "non moderators" with 200
+    And user "participant2" sets lobby state for room "room" to "no lobby" with 200
+    And user "participant3" sets lobby state for room "room" to "non moderators" with 403
+    And user "participant3" sets lobby state for room "room" to "no lobby" with 403
 
   Scenario: set lobby state in public room
     Given user "participant1" creates room "room"
@@ -31,43 +31,43 @@ Feature: conversation/lobby
     And user "guest" joins room "room" with 200
     And user "participant1" promotes "guest" in room "room" with 200
     And user "guest2" joins room "room" with 200
-    When user "participant1" sets lobby state for room "room" to "moderators only" with 200
-    And user "participant1" sets lobby state for room "room" to "all participants" with 200
-    And user "participant2" sets lobby state for room "room" to "moderators only" with 200
-    And user "participant2" sets lobby state for room "room" to "all participants" with 200
-    And user "participant3" sets lobby state for room "room" to "moderators only" with 403
-    And user "participant3" sets lobby state for room "room" to "all participants" with 403
-    And user "participant4" sets lobby state for room "room" to "moderators only" with 403
-    And user "participant4" sets lobby state for room "room" to "all participants" with 403
-    And user "guest" sets lobby state for room "room" to "moderators only" with 401
-    And user "guest" sets lobby state for room "room" to "all participants" with 401
-    And user "guest2" sets lobby state for room "room" to "moderators only" with 401
-    And user "guest2" sets lobby state for room "room" to "all participants" with 401
+    When user "participant1" sets lobby state for room "room" to "non moderators" with 200
+    And user "participant1" sets lobby state for room "room" to "no lobby" with 200
+    And user "participant2" sets lobby state for room "room" to "non moderators" with 200
+    And user "participant2" sets lobby state for room "room" to "no lobby" with 200
+    And user "participant3" sets lobby state for room "room" to "non moderators" with 403
+    And user "participant3" sets lobby state for room "room" to "no lobby" with 403
+    And user "participant4" sets lobby state for room "room" to "non moderators" with 403
+    And user "participant4" sets lobby state for room "room" to "no lobby" with 403
+    And user "guest" sets lobby state for room "room" to "non moderators" with 401
+    And user "guest" sets lobby state for room "room" to "no lobby" with 401
+    And user "guest2" sets lobby state for room "room" to "non moderators" with 401
+    And user "guest2" sets lobby state for room "room" to "no lobby" with 401
 
   Scenario: set lobby state in one-to-one room
     Given user "participant1" creates room "room"
       | roomType | 1 |
       | invite   | participant2 |
-    When user "participant1" sets lobby state for room "room" to "moderators only" with 400
-    And user "participant1" sets lobby state for room "room" to "all participants" with 400
-    And user "participant2" sets lobby state for room "room" to "moderators only" with 400
-    And user "participant2" sets lobby state for room "room" to "all participants" with 400
+    When user "participant1" sets lobby state for room "room" to "non moderators" with 400
+    And user "participant1" sets lobby state for room "room" to "no lobby" with 400
+    And user "participant2" sets lobby state for room "room" to "non moderators" with 400
+    And user "participant2" sets lobby state for room "room" to "no lobby" with 400
 
   Scenario: set lobby state in file room
     Given user "participant1" shares "welcome.txt" with user "participant2" with OCS 100
     And user "participant1" gets the room for path "welcome.txt" with 200
     And user "participant2" gets the room for path "welcome (2).txt" with 200
-    When user "participant1" sets lobby state for room "file welcome.txt room" to "moderators only" with 403
-    And user "participant1" sets lobby state for room "file welcome.txt room" to "all participants" with 403
-    And user "participant2" sets lobby state for room "file welcome (2).txt room" to "moderators only" with 403
-    And user "participant2" sets lobby state for room "file welcome (2).txt room" to "all participants" with 403
+    When user "participant1" sets lobby state for room "file welcome.txt room" to "non moderators" with 403
+    And user "participant1" sets lobby state for room "file welcome.txt room" to "no lobby" with 403
+    And user "participant2" sets lobby state for room "file welcome (2).txt room" to "non moderators" with 403
+    And user "participant2" sets lobby state for room "file welcome (2).txt room" to "no lobby" with 403
 
   Scenario: set lobby state of a room not joined to
     Given user "participant1" creates room "room"
       | roomType | 3 |
       | roomName | room |
-    When user "participant2" sets lobby state for room "room" to "moderators only" with 404
-    And user "participant2" sets lobby state for room "room" to "all participants" with 404
+    When user "participant2" sets lobby state for room "room" to "non moderators" with 404
+    And user "participant2" sets lobby state for room "room" to "no lobby" with 404
 
 
 
@@ -78,7 +78,7 @@ Feature: conversation/lobby
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" adds "participant3" to room "room" with 200
-    When user "participant1" sets lobby state for room "room" to "moderators only" with 200
+    When user "participant1" sets lobby state for room "room" to "non moderators" with 200
     Then user "participant1" joins room "room" with 200
     And user "participant2" joins room "room" with 200
     And user "participant3" joins room "room" with 200
@@ -95,7 +95,7 @@ Feature: conversation/lobby
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" adds "participant3" to room "room" with 200
-    When user "participant1" sets lobby state for room "room" to "moderators only" with 200
+    When user "participant1" sets lobby state for room "room" to "non moderators" with 200
     Then user "participant1" joins room "room" with 200
     And user "participant2" joins room "room" with 200
     And user "participant3" joins room "room" with 200
@@ -121,7 +121,7 @@ Feature: conversation/lobby
     And user "guest" joins room "room" with 200
     And user "participant1" promotes "guest" in room "room" with 200
     And user "guest2" joins room "room" with 200
-    When user "participant1" sets lobby state for room "room" to "moderators only" with 200
+    When user "participant1" sets lobby state for room "room" to "non moderators" with 200
     Then user "participant1" sends message "Message 1" to room "room" with 201
     And user "participant2" sends message "Message 2" to room "room" with 201
     And user "participant3" sends message "Message 3" to room "room" with 412
@@ -161,7 +161,7 @@ Feature: conversation/lobby
     And user "guest" joins room "room" with 200
     And user "participant1" promotes "guest" in room "room" with 200
     And user "guest2" joins room "room" with 200
-    When user "participant1" sets lobby state for room "room" to "moderators only" with 200
+    When user "participant1" sets lobby state for room "room" to "non moderators" with 200
     Then user "participant1" joins call "room" with 200
     And user "participant2" joins call "room" with 200
     And user "participant3" joins call "room" with 412
@@ -192,7 +192,7 @@ Feature: conversation/lobby
     And user "guest" joins room "room" with 200
     And user "participant1" promotes "guest" in room "room" with 200
     And user "guest2" joins room "room" with 200
-    When user "participant1" sets lobby state for room "room" to "moderators only" with 200
+    When user "participant1" sets lobby state for room "room" to "non moderators" with 200
     Then user "participant1" leaves room "room" with 200
     And user "participant2" leaves room "room" with 200
     And user "participant3" leaves room "room" with 200
diff --git a/tests/php/PasswordVerificationTest.php b/tests/php/PasswordVerificationTest.php
index 0238983fa..8cd2a6d9a 100644
--- a/tests/php/PasswordVerificationTest.php
+++ b/tests/php/PasswordVerificationTest.php
@@ -57,7 +57,7 @@ class PasswordVerificationTest extends TestCase {
 			1,
 			Room::PUBLIC_CALL,
 			Room::READ_WRITE,
-			Webinary::ALL_PARTICIPANTS,
+			Webinary::LOBBY_NONE,
 			'foobar',
 			'Test',
 			'passy',
diff --git a/tests/php/Signaling/BackendNotifierTest.php b/tests/php/Signaling/BackendNotifierTest.php
index 319c785da..8d9bc386b 100644
--- a/tests/php/Signaling/BackendNotifierTest.php
+++ b/tests/php/Signaling/BackendNotifierTest.php
@@ -323,7 +323,7 @@ class BackendNotifierTest extends \Test\TestCase {
 
 	public function testRoomLobbyStateChanged() {
 		$room = $this->manager->createPublicRoom();
-		$room->setLobby(Webinary::MODERATORS_ONLY, null);
+		$room->setLobby(Webinary::LOBBY_NON_MODERATORS, null);
 
 		$requests = $this->controller->getRequests();
 		$bodies = array_map(function($request) use ($room) {