Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 09:29:06 +0000 (09:29 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 09:29:06 +0000 (09:29 +0000)
Conflicts:
grade/grading/form/guide/tests/guide_test.php

grade/grading/form/guide/tests/guide_test.php

index f736bbc..5bf953e 100644 (file)
@@ -18,7 +18,7 @@
  * Unit tests for Marking Guide grading method.
  *
  * @package    gradingform_guide
- * @category   phpunit
+ * @category   test
  * @copyright  2015 Nikita Kalinin <nixorv@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/grade/grading/form/guide/lib.php');
  * Test cases for the Marking Guide.
  *
  * @package    gradingform_guide
- * @category   phpunit
+ * @category   test
  * @copyright  2015 Nikita Kalinin <nixorv@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */