Fix permission handling in unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>

4 files changed, 108 insertions, 84 deletions

diff --git a/tests/php/Controller/SignalingControllerTest.php b/tests/php/Controller/SignalingControllerTest.php
index 4cbd89e49..f0470f7a4 100644
--- a/tests/php/Controller/SignalingControllerTest.php
+++ b/tests/php/Controller/SignalingControllerTest.php
@@ -391,12 +391,15 @@ class SignalingControllerTest extends \Test\TestCase {
 			->willReturn($room);
 
 		$attendee = Attendee::fromRow([
-			'publishing_permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+			'permissions' => Attendee::PERMISSIONS_DEFAULT,
 		]);
 		$participant = $this->createMock(Participant::class);
 		$participant->expects($this->any())
 			->method('getAttendee')
 			->willReturn($attendee);
+		$participant->expects($this->any())
+			->method('getPermissions')
+			->willReturn(Attendee::PERMISSIONS_MAX_CUSTOM);
 		$room->expects($this->once())
 			->method('getParticipant')
 			->with($this->userId)
@@ -447,12 +450,15 @@ class SignalingControllerTest extends \Test\TestCase {
 			->willReturn($room);
 
 		$attendee = Attendee::fromRow([
-			'publishing_permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+			'permissions' => Attendee::PERMISSIONS_DEFAULT,
 		]);
 		$participant = $this->createMock(Participant::class);
 		$participant->expects($this->any())
 			->method('getAttendee')
 			->willReturn($attendee);
+		$participant->expects($this->any())
+			->method('getPermissions')
+			->willReturn(Attendee::PERMISSIONS_MAX_CUSTOM);
 		$room->expects($this->once())
 			->method('getParticipant')
 			->with($this->userId)
@@ -503,12 +509,15 @@ class SignalingControllerTest extends \Test\TestCase {
 			->willReturn($room);
 
 		$attendee = Attendee::fromRow([
-			'publishing_permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+			'permissions' => Attendee::PERMISSIONS_DEFAULT,
 		]);
 		$participant = $this->createMock(Participant::class);
 		$participant->expects($this->any())
 			->method('getAttendee')
 			->willReturn($attendee);
+		$participant->expects($this->any())
+			->method('getPermissions')
+			->willReturn(Attendee::PERMISSIONS_MAX_CUSTOM);
 		$participant->expects($this->once())
 			->method('hasModeratorPermissions')
 			->with(false)
@@ -565,12 +574,15 @@ class SignalingControllerTest extends \Test\TestCase {
 			->willReturn($room);
 
 		$attendee = Attendee::fromRow([
-			'publishing_permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+			'permissions' => Attendee::PERMISSIONS_DEFAULT,
 		]);
 		$participant = $this->createMock(Participant::class);
 		$participant->expects($this->any())
 			->method('getAttendee')
 			->willReturn($attendee);
+		$participant->expects($this->any())
+			->method('getPermissions')
+			->willReturn(Attendee::PERMISSIONS_MAX_CUSTOM);
 		$room->expects($this->once())
 			->method('getParticipantBySession')
 			->with($sessionId)
@@ -622,12 +634,15 @@ class SignalingControllerTest extends \Test\TestCase {
 			->willReturn($room);
 
 		$attendee = Attendee::fromRow([
-			'publishing_permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+			'permissions' => Attendee::PERMISSIONS_DEFAULT,
 		]);
 		$participant = $this->createMock(Participant::class);
 		$participant->expects($this->any())
 			->method('getAttendee')
 			->willReturn($attendee);
+		$participant->expects($this->any())
+			->method('getPermissions')
+			->willReturn(Attendee::PERMISSIONS_MAX_CUSTOM);
 		$room->expects($this->once())
 			->method('getParticipantBySession')
 			->with($sessionId)
@@ -670,7 +685,7 @@ class SignalingControllerTest extends \Test\TestCase {
 
 	public function dataBackendRoomUserPublicPermissions(): array {
 		return [
-			[Attendee::PERMISSIONS_NONE, []],
+			[Attendee::PERMISSIONS_DEFAULT, []],
 			[Attendee::PERMISSIONS_PUBLISH_AUDIO, ['publish-media']],
 			[Attendee::PERMISSIONS_PUBLISH_VIDEO, ['publish-media']],
 			[Attendee::PERMISSIONS_PUBLISH_AUDIO | Attendee::PERMISSIONS_PUBLISH_VIDEO, ['publish-media']],
@@ -703,6 +718,9 @@ class SignalingControllerTest extends \Test\TestCase {
 		$participant->expects($this->any())
 			->method('getAttendee')
 			->willReturn($attendee);
+		$participant->expects($this->any())
+			->method('getPermissions')
+			->willReturn($permissions);
 		$room->expects($this->once())
 			->method('getParticipant')
 			->with($this->userId)
@@ -788,12 +806,15 @@ class SignalingControllerTest extends \Test\TestCase {
 			->willReturn($room);
 
 		$attendee = Attendee::fromRow([
-			'publishing_permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+			'permissions' => Attendee::PERMISSIONS_DEFAULT,
 		]);
 		$participant = $this->createMock(Participant::class);
 		$participant->expects($this->any())
 			->method('getAttendee')
 			->willReturn($attendee);
+		$participant->expects($this->any())
+			->method('getPermissions')
+			->willReturn(Attendee::PERMISSIONS_MAX_CUSTOM);
 		$room->expects($this->once())
 			->method('getParticipant')
 			->with($this->userId)
diff --git a/tests/php/Model/AttendeeMapperTest.php b/tests/php/Model/AttendeeMapperTest.php
index 2d3478eec..602b317d6 100644
--- a/tests/php/Model/AttendeeMapperTest.php
+++ b/tests/php/Model/AttendeeMapperTest.php
@@ -54,66 +54,66 @@ class AttendeeMapperTest extends TestCase {
 						'actor_type' => Attendee::ACTOR_CIRCLES,
 						'actor_id' => 'c1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_GROUPS,
 						'actor_id' => 'g1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 				],
 				Participant::PERMISSIONS_MODIFY_SET,
-				Participant::FLAG_IN_CALL,
+				Attendee::PERMISSIONS_CALL_START,
 				false,
 				[
 					[
 						'actor_type' => Attendee::ACTOR_CIRCLES,
 						'actor_id' => 'c1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_GROUPS,
 						'actor_id' => 'g1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 				],
 			],
@@ -123,66 +123,66 @@ class AttendeeMapperTest extends TestCase {
 						'actor_type' => Attendee::ACTOR_CIRCLES,
 						'actor_id' => 'c1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_GROUPS,
 						'actor_id' => 'g1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 				],
 				Participant::PERMISSIONS_MODIFY_SET,
-				Participant::FLAG_IN_CALL,
+				Attendee::PERMISSIONS_CALL_START,
 				true,
 				[
 					[
 						'actor_type' => Attendee::ACTOR_CIRCLES,
 						'actor_id' => 'c1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_GROUPS,
 						'actor_id' => 'g1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 				],
 			],
@@ -192,42 +192,42 @@ class AttendeeMapperTest extends TestCase {
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 				],
 				Participant::PERMISSIONS_MODIFY_SET,
-				Participant::FLAG_IN_CALL,
+				Attendee::PERMISSIONS_CALL_START,
 				false,
 				[
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 				],
 			],
@@ -237,42 +237,42 @@ class AttendeeMapperTest extends TestCase {
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 				],
 				Participant::PERMISSIONS_MODIFY_SET,
-				Participant::FLAG_IN_CALL,
+				Attendee::PERMISSIONS_CALL_START,
 				true,
 				[
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 				],
 			],
@@ -282,54 +282,54 @@ class AttendeeMapperTest extends TestCase {
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_WITH_AUDIO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u2',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 				],
 				Participant::PERMISSIONS_MODIFY_ADD,
-				Participant::FLAG_IN_CALL,
+				Attendee::PERMISSIONS_CALL_START,
 				true,
 				[
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO + Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_WITH_VIDEO + Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_VIDEO + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u2',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 				],
 			],
@@ -339,66 +339,66 @@ class AttendeeMapperTest extends TestCase {
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO + Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_WITH_VIDEO + Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_VIDEO + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u2',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_IN_CALL,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_CALL_START,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u3',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 				],
 				Participant::PERMISSIONS_MODIFY_REMOVE,
-				Participant::FLAG_IN_CALL,
+				Attendee::PERMISSIONS_CALL_START,
 				true,
 				[
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'o1',
 						'participant_type' => Participant::OWNER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'm1',
 						'participant_type' => Participant::MODERATOR,
-						'permissions' => Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u1',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_WITH_AUDIO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u2',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_DISCONNECTED,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 					[
 						'actor_type' => Attendee::ACTOR_USERS,
 						'actor_id' => 'u3',
 						'participant_type' => Participant::USER,
-						'permissions' => Participant::FLAG_WITH_AUDIO + Participant::FLAG_WITH_VIDEO,
+						'permissions' => Attendee::PERMISSIONS_CUSTOM + Attendee::PERMISSIONS_PUBLISH_AUDIO + Attendee::PERMISSIONS_PUBLISH_VIDEO,
 					],
 				],
 			],
diff --git a/tests/php/RoomTest.php b/tests/php/RoomTest.php
index 65df9b395..422dd09d4 100644
--- a/tests/php/RoomTest.php
+++ b/tests/php/RoomTest.php
@@ -25,6 +25,7 @@ namespace OCA\Talk\Tests\php;
 use OC\EventDispatcher\EventDispatcher;
 use OCA\Talk\Events\VerifyRoomPasswordEvent;
 use OCA\Talk\Manager;
+use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Webinary;
@@ -72,6 +73,8 @@ class RoomTest extends TestCase {
 			'passy',
 			'',
 			0,
+			Attendee::PERMISSIONS_DEFAULT,
+			Attendee::PERMISSIONS_DEFAULT,
 			Participant::FLAG_DISCONNECTED,
 			null,
 			null,
diff --git a/tests/php/Signaling/BackendNotifierTest.php b/tests/php/Signaling/BackendNotifierTest.php
index 0c7c4e811..9cc7cc2bb 100644
--- a/tests/php/Signaling/BackendNotifierTest.php
+++ b/tests/php/Signaling/BackendNotifierTest.php
@@ -666,7 +666,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $userSession,
 						'participantType' => Participant::MODERATOR,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => Attendee::PERMISSIONS_MAX_DEFAULT,
 						'userId' => $this->userId,
 					],
 				],
@@ -676,7 +676,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $userSession,
 						'participantType' => Participant::MODERATOR,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => Attendee::PERMISSIONS_MAX_DEFAULT,
 						'userId' => $this->userId,
 					],
 				],
@@ -701,7 +701,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $guestSession,
 						'participantType' => Participant::GUEST_MODERATOR,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => Attendee::PERMISSIONS_MAX_DEFAULT,
 					],
 				],
 				'users' => [
@@ -710,7 +710,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $userSession,
 						'participantType' => Participant::MODERATOR,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => Attendee::PERMISSIONS_MAX_DEFAULT,
 						'userId' => $this->userId,
 					],
 					[
@@ -718,7 +718,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $guestSession,
 						'participantType' => Participant::GUEST_MODERATOR,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => Attendee::PERMISSIONS_MAX_DEFAULT,
 					],
 				],
 			],
@@ -745,7 +745,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $userSession,
 						'participantType' => Participant::MODERATOR,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => Attendee::PERMISSIONS_MAX_DEFAULT,
 						'userId' => $this->userId,
 					],
 					[
@@ -753,7 +753,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => 0,
 						'participantType' => Participant::MODERATOR,
-						'permissions' => Attendee::PERMISSIONS_NONE,
+						'participantPermissions' => Attendee::PERMISSIONS_CUSTOM,
 						'userId' => $notJoinedUserId,
 					],
 					[
@@ -761,7 +761,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $guestSession,
 						'participantType' => Participant::GUEST_MODERATOR,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => Attendee::PERMISSIONS_MAX_DEFAULT,
 					],
 				],
 			],
@@ -780,7 +780,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $userSession,
 						'participantType' => Participant::USER,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => (Attendee::PERMISSIONS_MAX_DEFAULT ^ Attendee::PERMISSIONS_LOBBY_IGNORE),
 						'userId' => $this->userId,
 					],
 				],
@@ -790,7 +790,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $userSession,
 						'participantType' => Participant::USER,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => (Attendee::PERMISSIONS_MAX_DEFAULT ^ Attendee::PERMISSIONS_LOBBY_IGNORE),
 						'userId' => $this->userId,
 					],
 					[
@@ -798,7 +798,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => 0,
 						'participantType' => Participant::MODERATOR,
-						'permissions' => Attendee::PERMISSIONS_NONE,
+						'participantPermissions' => Attendee::PERMISSIONS_CUSTOM,
 						'userId' => $notJoinedUserId,
 					],
 					[
@@ -806,7 +806,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $guestSession,
 						'participantType' => Participant::GUEST_MODERATOR,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => Attendee::PERMISSIONS_MAX_DEFAULT,
 					],
 				],
 			],
@@ -825,7 +825,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $guestSession,
 						'participantType' => Participant::GUEST,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => (Attendee::PERMISSIONS_MAX_DEFAULT ^ Attendee::PERMISSIONS_LOBBY_IGNORE),
 					],
 				],
 				'users' => [
@@ -834,7 +834,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $userSession,
 						'participantType' => Participant::USER,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => (Attendee::PERMISSIONS_MAX_DEFAULT ^ Attendee::PERMISSIONS_LOBBY_IGNORE),
 						'userId' => $this->userId,
 					],
 					[
@@ -842,7 +842,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => 0,
 						'participantType' => Participant::MODERATOR,
-						'permissions' => Attendee::PERMISSIONS_NONE,
+						'participantPermissions' => Attendee::PERMISSIONS_CUSTOM,
 						'userId' => $notJoinedUserId,
 					],
 					[
@@ -850,14 +850,14 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $guestSession,
 						'participantType' => Participant::GUEST,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => (Attendee::PERMISSIONS_MAX_DEFAULT ^ Attendee::PERMISSIONS_LOBBY_IGNORE),
 					],
 				],
 			],
 		]);
 
 		$this->controller->clearRequests();
-		$this->participantService->updatePermissions($room, $guestParticipant, Attendee::PERMISSIONS_NONE);
+		$this->participantService->updatePermissions($room, $guestParticipant, Attendee::PERMISSIONS_CUSTOM);
 
 		$this->assertMessageWasSent($room, [
 			'type' => 'participants',
@@ -869,7 +869,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $guestSession,
 						'participantType' => Participant::GUEST,
-						'permissions' => Attendee::PERMISSIONS_NONE,
+						'participantPermissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 				],
 				'users' => [
@@ -878,7 +878,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $userSession,
 						'participantType' => Participant::USER,
-						'permissions' => Attendee::PUBLISHING_PERMISSIONS_ALL,
+						'participantPermissions' => (Attendee::PERMISSIONS_MAX_DEFAULT ^ Attendee::PERMISSIONS_LOBBY_IGNORE),
 						'userId' => $this->userId,
 					],
 					[
@@ -886,7 +886,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => 0,
 						'participantType' => Participant::MODERATOR,
-						'permissions' => Attendee::PERMISSIONS_NONE,
+						'participantPermissions' => Attendee::PERMISSIONS_CUSTOM,
 						'userId' => $notJoinedUserId,
 					],
 					[
@@ -894,7 +894,7 @@ class BackendNotifierTest extends \Test\TestCase {
 						'lastPing' => 0,
 						'sessionId' => $guestSession,
 						'participantType' => Participant::GUEST,
-						'permissions' => Attendee::PERMISSIONS_NONE,
+						'participantPermissions' => Attendee::PERMISSIONS_CUSTOM,
 					],
 				],
 			],