mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68563 filters: Fix unit test regressions

Browse Source 
Also incrementing the plugin versions to make sure the unit test
environment is reinitialised and the tests are reliable.

Minor correction of phpdocs @package tags included.
This commit is contained in:
David Mudrák 2020-05-12 12:04:41 +02:00 committed by Simey Lameze
parent 4044914d17
commit 87f9e88ddd
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/tool/monitor/tests/eventobservers_test.php
View File

@ -498,8 +498,8 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
$modurl = new moodle_url('/mod/book/view.php', array('id' => $book->cmid));
$this->assertContains('<h2>'.$event->get_url()->out().'</h2>', $msg->fullmessagehtml);
$this->assertContains('<li>'.$modurl->out().'</li>', $msg->fullmessagehtml);
$this->assertRegExp('~<h2>.*' . preg_quote($event->get_url()->out(), '~') . '.*</h2>~', $msg->fullmessagehtml);
$this->assertRegExp('~<li>.*' . preg_quote($modurl->out(), '~') . '.*</li>~', $msg->fullmessagehtml);
$this->assertContains('<li><strong>'.$rule->get_name($context).'</strong></li>', $msg->fullmessagehtml);
$this->assertContains('<li>'.$rule->get_description($context).'</li>', $msg->fullmessagehtml);
$this->assertContains('<li>'.$rule->get_event_name().'</li>', $msg->fullmessagehtml);

6
course/tests/externallib_test.php
View File

@ -2383,8 +2383,8 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$this->assertCount(2, $result['courses']);
// Check default filters.
$this->assertCount(4, $result['courses'][0]['filters']);
$this->assertCount(4, $result['courses'][1]['filters']);
$this->assertCount(6, $result['courses'][0]['filters']);
$this->assertCount(6, $result['courses'][1]['filters']);
$result = core_course_external::get_courses_by_field('category', $category1->id);
$result = external_api::clean_returnvalue(core_course_external::get_courses_by_field_returns(), $result);
@ -2426,7 +2426,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
// Check default filters.
$filters = $result['courses'][0]['filters'];
$this->assertCount(4, $filters);
$this->assertCount(6, $filters);
$found = false;
foreach ($filters as $filter) {
if ($filter['filter'] == 'mediaplugin' and $filter['localstate'] == TEXTFILTER_OFF) {

5
filter/emoticon/version.php
View File

@ -17,14 +17,13 @@
/**
* Version information
*
* @package filter
* @subpackage emoticon
* @package filter_emoticon
* @copyright 2010 David Mudrak <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2019111800; // The current plugin version (Date: YYYYMMDDXX)
$plugin->version = 2020051200; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2019111200; // Requires this Moodle version
$plugin->component = 'filter_emoticon'; // Full name of the plugin (used for diagnostics)

3
filter/urltolink/version.php
View File

@ -17,8 +17,7 @@
/**
* Version details
*
* @package filter
* @subpackage urltolink
* @package filter_urltolink
* @copyright 2010 David Mudrak <david@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

2
lib/editor/atto/version.php
View File

@ -24,6 +24,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2019111800; // The current plugin version (Date: YYYYMMDDXX).
$plugin->version = 2020051200; // The current plugin version (Date: YYYYMMDDXX).
$plugin->requires = 2019111200; // Requires this Moodle version.
$plugin->component = 'editor_atto'; // Full name of the plugin (used for diagnostics).

4
lib/tests/weblib_format_text_test.php
View File

@ -97,8 +97,8 @@ class core_weblib_format_text_testcase extends advanced_testcase {
}
public function test_format_text_overflowdiv() {
$this->assertEquals('<div class="no-overflow"><p>:-)</p></div>',
format_text('<p>:-)</p>', FORMAT_HTML, array('overflowdiv' => true)));
$this->assertEquals('<div class="no-overflow"><p>Hello world</p></div>',
format_text('<p>Hello world</p>', FORMAT_HTML, array('overflowdiv' => true)));
}
/**