Merge branch 'MDL-68315-master' of https://github.com/kabalin/moodle
authorSara Arjona <sara@moodle.com>
Mon, 4 May 2020 08:37:17 +0000 (10:37 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 4 May 2020 08:37:17 +0000 (10:37 +0200)
lib/form/course.php
lib/form/tests/course_test.php [new file with mode: 0644]

index 1c11681..a26dcdf 100644 (file)
@@ -70,7 +70,7 @@ class MoodleQuickForm_course extends MoodleQuickForm_autocomplete {
      *                       'requiredcapabilities' - array of capabilities. Uses ANY to combine them.
      *                       'limittoenrolled' - boolean Limits to enrolled courses.
      *                       'includefrontpage' - boolean Enables the frontpage to be selected.
-     *                       'onlywithcompletion' - only courses where completion is enabled
+     *                       'onlywithcompletion' - boolean Limits to courses where completion is enabled.
      */
     public function __construct($elementname = null, $elementlabel = null, $attributes = array()) {
         if (!is_array($attributes)) {
@@ -105,8 +105,9 @@ class MoodleQuickForm_course extends MoodleQuickForm_autocomplete {
             $attributes['data-includefrontpage'] = SITEID;
             unset($attributes['includefrontpage']);
         }
-        if (!empty($options['onlywithcompletion'])) {
-            $validattributes['data-onlywithcompletion'] = 1;
+        if (!empty($attributes['onlywithcompletion'])) {
+            $attributes['data-onlywithcompletion'] = 1;
+            unset($attributes['onlywithcompletion']);
         }
 
         parent::__construct($elementname, $elementlabel, array(), $attributes);
diff --git a/lib/form/tests/course_test.php b/lib/form/tests/course_test.php
new file mode 100644 (file)
index 0000000..49c09ee
--- /dev/null
@@ -0,0 +1,77 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests for MoodleQuickForm_course.
+ *
+ * This file contains unit tests related to course forms element.
+ *
+ * @package     core_form
+ * @category    test
+ * @copyright   2020 Ruslan Kabalin
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->libdir . '/form/course.php');
+
+/**
+ * Unit tests for MoodleQuickForm_course
+ *
+ * Contains test cases for testing MoodleQuickForm_course.
+ *
+ * @package    core_form
+ * @category   test
+ * @copyright  2020 Ruslan Kabalin
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_form_course_testcase extends basic_testcase {
+
+    /**
+     * Test constructor supports all declared attributes.
+     */
+    public function test_constructor_attributes() {
+        $attributes = [
+            'exclude' => [1, 2],
+            'requiredcapabilities' => ['moodle/course:update'],
+        ];
+
+        $element = new MoodleQuickForm_course('testel', null, $attributes);
+        $html = $element->toHtml();
+        $this->assertContains('data-exclude="1,2"', $html);
+        $this->assertContains('data-requiredcapabilities="moodle/course:update"', $html);
+        $this->assertContains('data-limittoenrolled="0"', $html);
+        $this->assertNotContains('multiple', $html);
+        $this->assertNotContains('data-includefrontpage', $html);
+        $this->assertNotContains('data-onlywithcompletion', $html);
+
+        // Add more attributes.
+        $attributes = [
+            'multiple' => true,
+            'limittoenrolled' => true,
+            'includefrontpage' => true,
+            'onlywithcompletion' => true,
+        ];
+        $element = new MoodleQuickForm_course('testel', null, $attributes);
+        $html = $element->toHtml();
+        $this->assertContains('multiple', $html);
+        $this->assertContains('data-limittoenrolled="1"', $html);
+        $this->assertContains('data-includefrontpage="' . SITEID . '"', $html);
+        $this->assertContains('data-onlywithcompletion="1"', $html);
+    }
+}