mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-70658' of https://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Víctor Déniz 2021-11-25 22:03:44 +00:00
commit 81044f2c11
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/bigbluebuttonbn/classes/instance.php
View File

@ -110,7 +110,7 @@ class instance {
$cmtable = new \core\dml\table('course_modules', 'cm', 'cm');
$cmfrom = $cmtable->get_from_sql();
$bbbtable = new \core\dml\table('bigbluebuttonbn', 'bbb', 'bbb');
$bbbtable = new \core\dml\table('bigbluebuttonbn', 'bbb', 'b');
$bbbselect = $bbbtable->get_field_select();
$bbbfrom = $bbbtable->get_from_sql();
@ -155,7 +155,7 @@ EOF;
$cmtable = new \core\dml\table('course_modules', 'cm', 'cm');
$cmfrom = $cmtable->get_from_sql();
$bbbtable = new \core\dml\table('bigbluebuttonbn', 'bbb', 'bbb');
$bbbtable = new \core\dml\table('bigbluebuttonbn', 'bbb', 'b');
$bbbselect = $bbbtable->get_field_select();
$bbbfrom = $bbbtable->get_from_sql();
@ -241,7 +241,7 @@ EOF;
$cmtable = new \core\dml\table('course_modules', 'cm', 'cm');
$cmfrom = $cmtable->get_from_sql();
$bbbtable = new \core\dml\table('bigbluebuttonbn', 'bbb', 'bbb');
$bbbtable = new \core\dml\table('bigbluebuttonbn', 'bbb', 'b');
$bbbselect = $bbbtable->get_field_select();
$bbbfrom = $bbbtable->get_from_sql();

8
mod/bigbluebuttonbn/tests/meeting_test.php
View File

@ -198,6 +198,10 @@ class meeting_test extends \advanced_testcase {
* @covers ::can_join
*/
public function test_can_join_with_dates(int $type, ?string $groupname, int $groupmode, array $canjoin, array $dates) {
// Apply the data provider relative values to now.
array_walk($dates, function(&$val) {
$val = time() + $val;
});
$this->resetAfterTest();
[$meeting, $useringroup, $usernotingroup, $groupid, $activity] =
$this->prepare_meeting($type, $groupname, $groupmode, true, $dates);
@ -283,14 +287,14 @@ class meeting_test extends \advanced_testcase {
'groupname' => null,
'groupmode' => NOGROUPS,
'canjoin' => ['useringroup' => false, 'usernotingroup' => false],
'dates' => ['openingtime' => time() - 7200, 'closingtime' => time() - 3600]
'dates' => ['openingtime' => -7200, 'closingtime' => -3600]
],
'Instance Type ALL - No Group - Open in future' => [
'type' => instance::TYPE_ALL,
'groupname' => null,
'groupmode' => NOGROUPS,
'canjoin' => ['useringroup' => false, 'usernotingroup' => false],
'dates' => ['openingtime' => time() + 3600, 'closingtime' => time() + 7200]
'dates' => ['openingtime' => 3600, 'closingtime' => 7200]
],
];
}