Merge branch 'main' of github.com:ewallah/moodle-enrol_coursecompleted

ewallah · Sep 14, 2024 · 725c40e · 725c40e
2 parents c2cd30b + db3b3e7
commit 725c40e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/classes/plugin.php b/classes/plugin.php
@@ -220,9 +220,7 @@ public function enrol_user(
         if (isset($instance->roleid)) {
             $roleid = $instance->roleid;
         }
-        if (isset($instance->enrolstartdate)) {
-            $timestart = $instance->enrolstartdate;
-        }
+        $timestart = isset($instance->enrolstartdate) ? $instance->enrolstartdate : time();
         if (isset($instance->enrolenddate)) {
             $timeend = $instance->enrolenddate;
         }

diff --git a/tests/backup_test.php b/tests/backup_test.php
@@ -52,6 +52,7 @@ final class backup_test extends advanced_testcase {
      */
     protected function setUp(): void {
         global $CFG, $DB;
+        parent::setUp();
 
         $CFG->enablecompletion = true;
         $this->resetAfterTest(true);

diff --git a/tests/bulk_test.php b/tests/bulk_test.php
@@ -44,13 +44,15 @@ public static function setUpBeforeClass(): void {
         global $CFG;
         require_once($CFG->libdir . '/formslib.php');
         require_once($CFG->dirroot . '/enrol/locallib.php');
+        parent::setUpBeforeClass();
     }
 
     /**
      * Tests initial setup.
      */
     protected function setUp(): void {
         global $CFG;
+        parent::setUp();
         $CFG->enablecompletion = true;
         $this->resetAfterTest(true);
         $enabled = enrol_get_plugins(true);

diff --git a/tests/enrol_test.php b/tests/enrol_test.php
@@ -66,13 +66,15 @@ public static function setUpBeforeClass(): void {
         global $CFG;
         require_once($CFG->libdir . '/formslib.php');
         require_once($CFG->dirroot . '/enrol/locallib.php');
+        parent::setUpBeforeClass();
     }
 
     /**
      * Tests initial setup.
      */
     protected function setUp(): void {
         global $CFG, $DB;
+        parent::setUp();
 
         $CFG->enablecompletion = true;
         $this->resetAfterTest(true);

diff --git a/tests/manager_test.php b/tests/manager_test.php
@@ -49,6 +49,7 @@ final class manager_test extends \advanced_testcase {
      */
     protected function setUp(): void {
         global $CFG, $DB;
+        parent::setUp();
         $CFG->enablecompletion = true;
         $this->resetAfterTest(true);
         $enabled = enrol_get_plugins(true);

diff --git a/tests/other_test.php b/tests/other_test.php
@@ -47,6 +47,7 @@ final class other_test extends \advanced_testcase {
      */
     protected function setUp(): void {
         global $CFG;
+        parent::setUp();
         $CFG->enablecompletion = true;
         $this->resetAfterTest(true);
         $enabled = enrol_get_plugins(true);

diff --git a/tests/time_enrolled_test.php b/tests/time_enrolled_test.php
@@ -41,6 +41,7 @@ final class time_enrolled_test extends \advanced_testcase {
     protected function setUp(): void {
         global $CFG;
         require_once($CFG->dirroot . '/enrol/locallib.php');
+        parent::setUp();
         $CFG->enablecompletion = true;
         $this->resetAfterTest(true);
         $enabled = enrol_get_plugins(true);