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

Merge branch 'MDL-55133-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE

Browse Source
This commit is contained in:
David Monllao
2016-07-12 13:16:40 +02:00
parent c4312f0ac7 2c72d1b8b5
commit a59d8bfdcb
2 changed files with 96 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/requirejs.php
+1 -1
View File
@@ -90,7 +90,7 @@ class core_requirejs {
$subsystems = core_component::get_core_subsystems();
foreach ($subsystems as $subsystem => $dir) {
if (!empty($dir) && is_dir($dir . '/amd')) {
$jsdirs[$subsystem] = $dir . '/amd';
$jsdirs['core_' . $subsystem] = $dir . '/amd';
}
}
$plugintypes = core_component::get_plugin_types();
lib/tests/requirejs_test.php
+95
View File
@@ -0,0 +1,95 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for requirejs loader.
*
* @package core
* @author Damyon Wiese <[email protected]>
* @copyright 2016 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
/**
* Unit tests for requirejs.
*
* @package core
* @author Damyon Wiese <[email protected]>
* @copyright 2016 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_requirejs_testcase extends advanced_testcase {
/**
* Test requirejs loader
*/
public function test_requirejs() {
global $CFG;
// Find a core module.
$result = core_requirejs::find_one_amd_module('core', 'templates', false);
$expected = ['core/templates' => $CFG->dirroot . '/lib/amd/build/templates.min.js'];
$this->assertEquals($expected, $result);
$result = core_requirejs::find_one_amd_module('core', 'templates', true);
$expected = ['core/templates' => $CFG->dirroot . '/lib/amd/src/templates.js'];
$this->assertEquals($expected, $result);
// Find a subsystem module (none exist yet).
$result = core_requirejs::find_one_amd_module('core_group', 'doesnotexist', false);
$expected = [];
$this->assertEquals($expected, $result);
// Find a plugin module.
$result = core_requirejs::find_one_amd_module('tool_templatelibrary', 'search', true);
$expected = ['tool_templatelibrary/search' => $CFG->dirroot . '/admin/tool/templatelibrary/amd/src/search.js'];
$this->assertEquals($expected, $result);
// Find all modules - no debugging.
$result = core_requirejs::find_all_amd_modules(true);
foreach ($result as $key => $path) {
// Lets verify the first part of the key is a valid component name and the second part correctly contains "min" or not.
list($component, $template) = explode('/', $key, 2);
// Can we resolve it to a valid dir?
$dir = core_component::get_component_directory($component);
$this->assertNotEmpty($dir);
// Only "core" is allowed to have no _ in component names.
if (strpos($component, '_') === false) {
$this->assertEquals('core', $component);
}
$this->assertNotContains('.min', $path);
}
// Find all modules - debugging.
$result = core_requirejs::find_all_amd_modules(false);
foreach ($result as $key => $path) {
// Lets verify the first part of the key is a valid component name and the second part correctly contains "min" or not.
list($component, $template) = explode('/', $key, 2);
$dir = core_component::get_component_directory($component);
$this->assertNotEmpty($dir);
// Only "core" is allowed to have no _ in component names.
if (strpos($component, '_') === false) {
$this->assertEquals('core', $component);
}
$this->assertContains('.min', $path);
}
}
}