moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-56463_master-fix' of git://github.com/dmonllao/moodle

Browse source
This commit is contained in:
David Monllao 2016-11-17 13:27:21 +08:00
commit c35ef2e9a0
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/tool/mobile/tests/externallib_test.php
View file

@ -124,13 +124,16 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
$result = external::get_config(); $result = external::get_config();
$result = external_api::clean_returnvalue(external::get_config_returns(), $result); $result = external_api::clean_returnvalue(external::get_config_returns(), $result);
// SITE summary is null in phpunit which gets transformed to an empty string by format_text.
list($sitesummary, $unused) = external_format_text($SITE->summary, $SITE->summaryformat, context_system::instance()->id);
// Test default values. // Test default values.
$context = context_system::instance(); $context = context_system::instance();
$expected = array( $expected = array(
array('name' => 'fullname', 'value' => $SITE->fullname), array('name' => 'fullname', 'value' => $SITE->fullname),
array('name' => 'shortname', 'value' => $SITE->shortname), array('name' => 'shortname', 'value' => $SITE->shortname),
array('name' => 'summary', 'value' => $sitesummary),
array('name' => 'summaryformat', 'value' => FORMAT_HTML), array('name' => 'summaryformat', 'value' => FORMAT_HTML),
array('name' => 'summary', 'value' => $SITE->summary),
array('name' => 'frontpage', 'value' => $CFG->frontpage), array('name' => 'frontpage', 'value' => $CFG->frontpage),
array('name' => 'frontpageloggedin', 'value' => $CFG->frontpageloggedin), array('name' => 'frontpageloggedin', 'value' => $CFG->frontpageloggedin),
array('name' => 'maxcategorydepth', 'value' => $CFG->maxcategorydepth), array('name' => 'maxcategorydepth', 'value' => $CFG->maxcategorydepth),