Skip to content

Commit

Permalink
Merge branch 'MDL-72701-39' of https://github.com/andrewnicols/moodle
Browse files Browse the repository at this point in the history
…into MOODLE_39_STABLE
  • Loading branch information
junpataleta committed Dec 23, 2021
2 parents 8e12159 + 80df50a commit 3adfa34
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion backup/util/dbops/tests/restore_dbops_test.php
Expand Up @@ -301,7 +301,7 @@ private function precheck_user_cases($email) {
* Test restore precheck_user method
*
* @dataProvider precheck_user_provider
* @covers restore_dbops::precheck_user()
* @covers \restore_dbops::precheck_user()
*
* @param array $dbuser
* @param array $backupuser
Expand Down
4 changes: 2 additions & 2 deletions badges/tests/badgeslib_test.php
Expand Up @@ -622,7 +622,7 @@ public function test_badges_observer_profile_criteria_review() {
/**
* Test badges observer when cohort_member_added event is fired and user required to belong to any cohort.
*
* @covers award_criteria_cohort
* @covers \award_criteria_cohort
*/
public function test_badges_observer_any_cohort_criteria_review() {
global $CFG;
Expand Down Expand Up @@ -665,7 +665,7 @@ public function test_badges_observer_any_cohort_criteria_review() {
/**
* Test badges observer when cohort_member_added event is fired and user required to belong to multiple (all) cohorts.
*
* @covers award_criteria_cohort
* @covers \award_criteria_cohort
*/
public function test_badges_observer_all_cohort_criteria_review() {
global $CFG;
Expand Down
2 changes: 1 addition & 1 deletion contentbank/tests/external/rename_content_test.php
Expand Up @@ -41,7 +41,7 @@
* @package core_contentbank
* @copyright 2020 Sara Arjona <sara@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass \core_contentbank\external
* @coversDefaultClass \core_contentbank\external\rename_content
*/
class rename_content_testcase extends \externallib_advanced_testcase {

Expand Down
8 changes: 4 additions & 4 deletions lib/filestorage/tests/file_storage_test.php
Expand Up @@ -35,7 +35,7 @@
*
* @copyright 2012 David Mudrak <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass file_storage
* @coversDefaultClass \file_storage
*/
class core_files_file_storage_testcase extends advanced_testcase {

Expand Down Expand Up @@ -287,7 +287,7 @@ public function test_get_file_preview_nonimage() {
* Make sure renaming is working
*
* @copyright 2012 Dongsheng Cai {@link http://dongsheng.org}
* @covers stored_file::rename
* @covers \stored_file::rename
*/
public function test_file_renaming() {
global $CFG;
Expand Down Expand Up @@ -1844,7 +1844,7 @@ public function test_create_file_from_pathname_duplicate_file() {
/**
* Calling stored_file::delete_reference() on a non-reference file throws coding_exception
*
* @covers stored_file::delete_reference
* @covers \stored_file::delete_reference
*/
public function test_delete_reference_on_nonreference() {

Expand Down Expand Up @@ -1872,7 +1872,7 @@ public function test_delete_reference_on_nonreference() {
* Calling stored_file::delete_reference() on a reference file does not affect other
* symlinks to the same original
*
* @covers stored_file::delete_reference
* @covers \stored_file::delete_reference
*/
public function test_delete_reference_one_symlink_does_not_rule_them_all() {

Expand Down
2 changes: 1 addition & 1 deletion lib/filestorage/tests/file_system_filedir_test.php
Expand Up @@ -36,7 +36,7 @@
* @category files
* @copyright 2017 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass file_system_filedir
* @coversDefaultClass \file_system_filedir
*/
class core_files_file_system_filedir_testcase extends advanced_testcase {

Expand Down
2 changes: 1 addition & 1 deletion lib/filestorage/tests/file_system_test.php
Expand Up @@ -35,7 +35,7 @@
* @category phpunit
* @copyright 2017 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass file_system
* @coversDefaultClass \file_system
*/
class core_files_file_system_testcase extends advanced_testcase {

Expand Down
Expand Up @@ -31,7 +31,7 @@
*
* @package core
* @category test
* @covers core_media_player_native
* @covers \core_media_player_native
* @copyright 2019 Ruslan Kabalin
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down Expand Up @@ -160,4 +160,4 @@ public function test_replace_sources() {
$this->assertNotContains('<source src="http://example.org/some_filename.mp4" />', $content);
$this->assertNotContains('<source src="http://example.org/some_filename_hires.mp4" />', $content);
}
}
}
Expand Up @@ -38,7 +38,7 @@
*
* @copyright 2020 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass core\external\output\icon_system\load_fontawesome_map
* @coversDefaultClass \core\external\output\icon_system\load_fontawesome_map
*/
class load_fontawesome_map_testcase extends externallib_advanced_testcase {

Expand Down
2 changes: 1 addition & 1 deletion lib/tests/external/record_userfeedback_action_test.php
Expand Up @@ -39,7 +39,7 @@
*
* @copyright 2020 Shamim Rezaie <shamim@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @coversDefaultClass record_userfeedback_action
* @coversDefaultClass \core\external\record_userfeedback_action
*/
class record_userfeedback_action_testcase extends externallib_advanced_testcase {

Expand Down
1 change: 1 addition & 0 deletions lib/tests/oauth2_test.php
Expand Up @@ -30,6 +30,7 @@
* @package core
* @copyright 2017 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
* @coversDefaultClass \core\oauth2\api
*/
class core_oauth2_testcase extends advanced_testcase {

Expand Down
2 changes: 1 addition & 1 deletion lib/tests/output/icon_system_test.php
Expand Up @@ -31,7 +31,7 @@
/**
* Unit tests for the `icon_system` class.
*
* @coversDefaultClass core\output\icon_system
* @coversDefaultClass \core\output\icon_system
*/
class icon_system_test extends advanced_testcase {
/**
Expand Down

0 comments on commit 3adfa34

Please sign in to comment.