L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-67173-master' of git://github.com/cescobedo/moodle

Browse Source
This commit is contained in:
Sara Arjona
2019-11-09 08:55:47 +01:00
parent 75bf9a3ab8 3b85322940
commit 3b381bd2da
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
h5p/classes/external.php
+10 -1
View File
@@ -99,9 +99,18 @@ class external extends external_api {
$messages = $h5pplayer->get_messages();
} catch (\moodle_exception $e) {
$messages = (object) [
'exception' => $e->getMessage(),
'code' => $e->getCode(),
];
// To mantain the coherence between web coding error and Mobile coding errors.
// We need to return the same message error to Mobile.
// The 'out_al_local_url called on a non-local URL' error is provided by the \moodle_exception.
// We have to translate to h5pinvalidurl which is the same coding error showed in web.
if ($e->errorcode === 'codingerror' &&
$e->a === 'out_as_local_url called on a non-local URL') {
$messages->exception = get_string('h5pinvalidurl', 'core_h5p');
} else {
$messages->exception = $e->getMessage();
}
}
if (empty($messages->error) && empty($messages->exception)) {
h5p/tests/external_test.php
+11
View File
@@ -124,6 +124,17 @@ class core_h5p_external_testcase extends externallib_advanced_testcase {
// Check the warnings to be sure that h5pinvalidurl is the message by moodle_exception.
$this->assertEquals($urlempty, $result['warnings'][0]['item']);
$this->assertEquals(get_string('h5pinvalidurl', 'core_h5p'), $result['warnings'][0]['message']);
// Create a non-local URL.
$urlnonlocal = 'http://www.google.com/pluginfile.php/644/block_html/content/arithmetic-quiz-1-1.h5p';
$result = external::get_trusted_h5p_file($urlnonlocal, 0, 0, 0, 0);
$result = external_api::clean_returnvalue(external::get_trusted_h5p_file_returns(), $result);
// Expected result: Just 1 record on warnings and none on files.
$this->assertCount(0, $result['files']);
$this->assertCount(1, $result['warnings']);
// Check the warnings to be sure that h5pinvalidurl is the message by moodle_exception.
$this->assertEquals($urlnonlocal, $result['warnings'][0]['item']);
$this->assertEquals(get_string('h5pinvalidurl', 'core_h5p'), $result['warnings'][0]['message']);
}
/**