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

Merge branch 'MDL-61215-master' of git://github.com/sarjona/moodle

Browse source
This commit is contained in:
Andrew Nicols 2020-08-20 07:14:15 +08:00
commit d48a0a9a5d
8 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/form/tests/filetypes_util_test.php
View file

@ -302,10 +302,10 @@ class filetypes_util_testcase extends advanced_testcase {
// All these three files are in both "image" and also "web_image"
// groups. We display both groups.
$data = $util->data_for_browser('jpg png gif', true, '.gif');
$this->assertEquals(2, count($data));
$this->assertEquals(3, count($data));
$this->assertTrue($data[0]->key !== $data[1]->key);
foreach ($data as $group) {
$this->assertTrue(($group->key === 'image' || $group->key === 'web_image'));
$this->assertTrue(($group->key === 'image' || $group->key === 'web_image' || $group->key === 'optimised_image'));
$this->assertEquals(3, count($group->types));
$this->assertFalse($group->selectable);
foreach ($group->types as $ext) {
@ -317,11 +317,11 @@ class filetypes_util_testcase extends advanced_testcase {
}
}
// There is a group web_image which is a subset of the group image. The
// file extensions that fall into both groups will be displayed twice.
// The groups web_image and optimised_image are a subset of the group image. The
// file extensions that fall into these groups will be displayed thrice.
$data = $util->data_for_browser('web_image');
foreach ($data as $group) {
$this->assertTrue(($group->key === 'image' || $group->key === 'web_image'));
$this->assertTrue(($group->key === 'image' || $group->key === 'web_image' || $group->key === 'optimised_image'));
}
// Check that "All file types" are displayed first.