Skip to content

Commit ab9ca96

Browse files
sualkosualko
authored
Merge pull request #107 from littleredbutton/106-add-v2.4.3-params
Add v2.4.3 params and missing tests
2 parents 232ebb7 + 706b6ea commit ab9ca96

3 files changed

Lines changed: 90 additions & 38 deletions

File tree

‎src/Parameters/CreateMeetingParameters.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
* @method $this setSequence(int $sequence)
4848
* @method bool|null isFreeJoin()
4949
* @method $this setFreeJoin(bool $isFreeJoin)
50+
* @method bool|null isBreakoutRoomsEnabled()
51+
* @method $this setBreakoutRoomsEnabled(bool $isBreakoutRoomsEnabled)
52+
* @method bool|null isBreakoutRoomsPrivateChatEnabled()
53+
* @method $this setBreakoutRoomsPrivateChatEnabled(bool $isBreakoutRoomsPrivateChatEnabled)
54+
* @method bool|null isBreakoutRoomsRecord()
55+
* @method $this setBreakoutRoomsRecord(bool $isBreakoutRoomsRecord)
5056
* @method string getModeratorOnlyMessage()
5157
* @method $this setModeratorOnlyMessage(string $message)
5258
* @method bool|null isAutoStartRecording()
@@ -101,6 +107,10 @@
101107
* @method $this setLearningDashboardCleanupDelayInMinutes(int $learningDashboardCleanupDelayInMinutes)
102108
* @method bool|null isAllowModsToEjectCameras()
103109
* @method $this setAllowModsToEjectCameras(bool $isAllowModsToEjectCameras)
110+
* @method bool|null isAllowRequestsWithoutSession()
111+
* @method $this setAllowRequestsWithoutSession(bool $isAllowRequestsWithoutSession)
112+
* @method bool|null isVirtualBackgroundsDisabled()
113+
* @method $this setVirtualBackgroundsDisabled(bool $isVirtualBackgroundsDisabled)
104114
*
105115
*/
106116
class CreateMeetingParameters extends MetaParameters
@@ -340,6 +350,16 @@ class CreateMeetingParameters extends MetaParameters
340350
*/
341351
protected $allowModsToEjectCameras;
342352

353+
/**
354+
* @var bool
355+
*/
356+
protected $allowRequestsWithoutSession;
357+
358+
/**
359+
* @var bool
360+
*/
361+
protected $virtualBackgroundsDisabled;
362+
343363
/**
344364
* @var array
345365
*/

‎tests/TestCase.php‎

Lines changed: 61 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -66,43 +66,57 @@ protected function createRealMeeting($bbb)
6666
protected function generateCreateParams()
6767
{
6868
return [
69-
'name' => $this->faker->name,
70-
'meetingID' => $this->faker->uuid,
71-
'attendeePW' => $this->faker->password,
72-
'moderatorPW' => $this->faker->password,
73-
'autoStartRecording' => $this->faker->boolean(50),
74-
'dialNumber' => $this->faker->phoneNumber,
75-
'voiceBridge' => $this->faker->randomNumber(5),
76-
'logoutURL' => $this->faker->url,
77-
'maxParticipants' => $this->faker->numberBetween(2, 100),
78-
'record' => $this->faker->boolean(50),
79-
'duration' => $this->faker->numberBetween(0, 6000),
80-
'welcome' => $this->faker->sentence,
81-
'allowStartStopRecording' => $this->faker->boolean(50),
82-
'moderatorOnlyMessage' => $this->faker->sentence,
83-
'webcamsOnlyForModerator' => $this->faker->boolean(50),
84-
'logo' => $this->faker->imageUrl(330, 70),
85-
'copyright' => $this->faker->text,
86-
'guestPolicy' => CreateMeetingParameters::ALWAYS_ACCEPT,
87-
'muteOnStart' => $this->faker->boolean(50),
88-
'lockSettingsDisableCam' => $this->faker->boolean(50),
89-
'lockSettingsDisableMic' => $this->faker->boolean(50),
90-
'lockSettingsDisablePrivateChat' => $this->faker->boolean(50),
91-
'lockSettingsDisablePublicChat' => $this->faker->boolean(50),
92-
'lockSettingsDisableNote' => $this->faker->boolean(50),
93-
'lockSettingsHideUserList' => $this->faker->boolean(50),
94-
'lockSettingsLockedLayout' => $this->faker->boolean(50),
95-
'lockSettingsLockOnJoin' => $this->faker->boolean(50),
96-
'lockSettingsLockOnJoinConfigurable' => $this->faker->boolean(50),
97-
'allowModsToUnmuteUsers' => $this->faker->boolean(50),
98-
'meta_presenter' => $this->faker->name,
99-
'meta_endCallbackUrl' => $this->faker->url,
100-
'meta_bbb-recording-ready-url' => $this->faker->url,
101-
'bannerText' => $this->faker->sentence,
102-
'bannerColor' => $this->faker->hexcolor,
103-
'meetingKeepEvents' => $this->faker->boolean(50),
104-
'endWhenNoModerator' => $this->faker->boolean(50),
105-
'endWhenNoModeratorDelayInMinutes' => $this->faker->numberBetween(1, 100),
69+
'name' => $this->faker->name,
70+
'meetingID' => $this->faker->uuid,
71+
'attendeePW' => $this->faker->password,
72+
'moderatorPW' => $this->faker->password,
73+
'autoStartRecording' => $this->faker->boolean(50),
74+
'dialNumber' => $this->faker->phoneNumber,
75+
'voiceBridge' => $this->faker->randomNumber(5),
76+
'logoutURL' => $this->faker->url,
77+
'maxParticipants' => $this->faker->numberBetween(2, 100),
78+
'record' => $this->faker->boolean(50),
79+
'duration' => $this->faker->numberBetween(0, 6000),
80+
'welcome' => $this->faker->sentence,
81+
'allowStartStopRecording' => $this->faker->boolean(50),
82+
'moderatorOnlyMessage' => $this->faker->sentence,
83+
'webcamsOnlyForModerator' => $this->faker->boolean(50),
84+
'logo' => $this->faker->imageUrl(330, 70),
85+
'copyright' => $this->faker->text,
86+
'guestPolicy' => CreateMeetingParameters::ALWAYS_ACCEPT,
87+
'muteOnStart' => $this->faker->boolean(50),
88+
'lockSettingsDisableCam' => $this->faker->boolean(50),
89+
'lockSettingsDisableMic' => $this->faker->boolean(50),
90+
'lockSettingsDisablePrivateChat' => $this->faker->boolean(50),
91+
'lockSettingsDisablePublicChat' => $this->faker->boolean(50),
92+
'lockSettingsDisableNote' => $this->faker->boolean(50),
93+
'lockSettingsHideUserList' => $this->faker->boolean(50),
94+
'lockSettingsLockedLayout' => $this->faker->boolean(50),
95+
'lockSettingsLockOnJoin' => $this->faker->boolean(50),
96+
'lockSettingsLockOnJoinConfigurable' => $this->faker->boolean(50),
97+
'allowModsToUnmuteUsers' => $this->faker->boolean(50),
98+
'meta_presenter' => $this->faker->name,
99+
'meta_endCallbackUrl' => $this->faker->url,
100+
'meta_bbb-recording-ready-url' => $this->faker->url,
101+
'bannerText' => $this->faker->sentence,
102+
'bannerColor' => $this->faker->hexcolor,
103+
'meetingKeepEvents' => $this->faker->boolean(50),
104+
'endWhenNoModerator' => $this->faker->boolean(50),
105+
'endWhenNoModeratorDelayInMinutes' => $this->faker->numberBetween(1, 100),
106+
'meetingLayout' => $this->faker->randomElement([
107+
CreateMeetingParameters::CUSTOM_LAYOUT,
108+
CreateMeetingParameters::SMART_LAYOUT,
109+
CreateMeetingParameters::PRESENTATION_FOCUS,
110+
CreateMeetingParameters::VIDEO_FOCUS
111+
]),
112+
'learningDashboardEnabled' => $this->faker->boolean(50),
113+
'learningDashboardCleanupDelayInMinutes' => $this->faker->numberBetween(1, 100),
114+
'allowModsToEjectCameras' => $this->faker->boolean(50),
115+
'breakoutRoomsEnabled' => $this->faker->boolean(50),
116+
'breakoutRoomsPrivateChatEnabled' => $this->faker->boolean(50),
117+
'breakoutRoomsRecord' => $this->faker->boolean(50),
118+
'allowRequestsWithoutSession' => $this->faker->boolean(50),
119+
'virtualBackgroundsDisabled' => $this->faker->boolean(50),
106120
];
107121
}
108122

@@ -163,7 +177,16 @@ protected function getCreateMock($params)
163177
->setBannerColor($params['bannerColor'])
164178
->setMeetingKeepEvents($params['meetingKeepEvents'])
165179
->setEndWhenNoModerator($params['endWhenNoModerator'])
166-
->setEndWhenNoModeratorDelayInMinutes($params['endWhenNoModeratorDelayInMinutes']);
180+
->setEndWhenNoModeratorDelayInMinutes($params['endWhenNoModeratorDelayInMinutes'])
181+
->setMeetingLayout($params['meetingLayout'])
182+
->setLearningDashboardEnabled($params['learningDashboardEnabled'])
183+
->setLearningDashboardCleanupDelayInMinutes($params['learningDashboardCleanupDelayInMinutes'])
184+
->setAllowModsToEjectCameras($params['allowModsToEjectCameras'])
185+
->setBreakoutRoomsEnabled($params['breakoutRoomsEnabled'])
186+
->setBreakoutRoomsPrivateChatEnabled($params['breakoutRoomsPrivateChatEnabled'])
187+
->setBreakoutRoomsRecord($params['breakoutRoomsRecord'])
188+
->setAllowRequestsWithoutSession($params['allowRequestsWithoutSession'])
189+
->setVirtualBackgroundsDisabled($params['virtualBackgroundsDisabled']);
167190
}
168191

169192
/**

‎tests/unit/Parameters/CreateMeetingParametersTest.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,15 @@ public function testCreateMeetingParameters()
6969
$this->assertEquals($params['meetingKeepEvents'], $createMeetingParams->isMeetingKeepEvents());
7070
$this->assertEquals($params['endWhenNoModerator'], $createMeetingParams->isEndWhenNoModerator());
7171
$this->assertEquals($params['endWhenNoModeratorDelayInMinutes'], $createMeetingParams->getEndWhenNoModeratorDelayInMinutes());
72+
$this->assertEquals($params['meetingLayout'], $createMeetingParams->getMeetingLayout());
73+
$this->assertEquals($params['learningDashboardEnabled'], $createMeetingParams->isLearningDashboardEnabled());
74+
$this->assertEquals($params['learningDashboardCleanupDelayInMinutes'], $createMeetingParams->getLearningDashboardCleanupDelayInMinutes());
75+
$this->assertEquals($params['allowModsToEjectCameras'], $createMeetingParams->isAllowModsToEjectCameras());
76+
$this->assertEquals($params['breakoutRoomsEnabled'], $createMeetingParams->isBreakoutRoomsEnabled());
77+
$this->assertEquals($params['breakoutRoomsPrivateChatEnabled'], $createMeetingParams->isBreakoutRoomsPrivateChatEnabled());
78+
$this->assertEquals($params['breakoutRoomsRecord'], $createMeetingParams->isBreakoutRoomsRecord());
79+
$this->assertEquals($params['allowRequestsWithoutSession'], $createMeetingParams->isAllowRequestsWithoutSession());
80+
$this->assertEquals($params['virtualBackgroundsDisabled'], $createMeetingParams->isVirtualBackgroundsDisabled());
7281

7382
// Check values are empty of this is not a breakout room
7483
$this->assertNull($createMeetingParams->isBreakout());

0 commit comments

Comments
 (0)