mirrored from git://git.moodle.org/moodle.git
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDL-64464 drag-drop qtypes: allow <span lang=".."> id draggables
This is for accessibility, so that screen readers can read the drag items with correct pronunciation.
- Loading branch information
Showing
10 changed files
with
423 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <?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 the drag-and-drop onto image edit form. | ||
| * | ||
| * @package qtype_ddimageortext | ||
| * @copyright 2019 The Open University | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| defined('MOODLE_INTERNAL') || die(); | ||
| global $CFG; | ||
|
|
||
| require_once($CFG->dirroot . '/question/engine/tests/helpers.php'); | ||
| require_once($CFG->dirroot . '/question/type/edit_question_form.php'); | ||
| require_once($CFG->dirroot . '/question/type/ddimageortext/edit_ddimageortext_form.php'); | ||
|
|
||
| /** | ||
| * Unit tests for the drag-and-drop onto image edit form. | ||
| * | ||
| * @copyright 2019 The Open University | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| class qtype_ddimageortext_edit_form_test extends advanced_testcase { | ||
| /** | ||
| * Helper method. | ||
| * | ||
| * @return array with two elements: | ||
| * question_edit_form great a question form instance that can be tested. | ||
| * stdClass the question category. | ||
| */ | ||
| protected function get_form() { | ||
| $this->setAdminUser(); | ||
| $this->resetAfterTest(); | ||
|
|
||
| $syscontext = context_system::instance(); | ||
| $category = question_make_default_categories(array($syscontext)); | ||
| $fakequestion = new stdClass(); | ||
| $fakequestion->qtype = 'ddimageortext'; | ||
| $fakequestion->contextid = $syscontext->id; | ||
| $fakequestion->createdby = 2; | ||
| $fakequestion->category = $category->id; | ||
| $fakequestion->questiontext = 'Test question'; | ||
| $fakequestion->options = new stdClass(); | ||
| $fakequestion->options->answers = array(); | ||
| $fakequestion->formoptions = new stdClass(); | ||
| $fakequestion->formoptions->movecontext = null; | ||
| $fakequestion->formoptions->repeatelements = true; | ||
| $fakequestion->inputs = null; | ||
|
|
||
| $form = new qtype_ddimageortext_edit_form(new moodle_url('/'), $fakequestion, $category, | ||
| new question_edit_contexts($syscontext)); | ||
|
|
||
| return [$form, $category]; | ||
| } | ||
|
|
||
| /** | ||
| * Test the form correctly validates the HTML allowed in items. | ||
| */ | ||
| public function test_item_validation() { | ||
| list($form, $category) = $this->get_form(); | ||
|
|
||
| $submitteddata = [ | ||
| 'category' => $category->id, | ||
| 'bgimage' => '', | ||
| 'nodropzone' => 0, | ||
| 'noitems' => 5, | ||
| 'drags' => [ | ||
| ['dragitemtype' => 'image'], | ||
| ['dragitemtype' => 'image'], | ||
| ['dragitemtype' => 'word'], | ||
| ['dragitemtype' => 'word'], | ||
| ['dragitemtype' => 'word'], | ||
| ], | ||
| 'draglabel' => [ | ||
| 'frog', | ||
| '<b>toad</b>', | ||
| 'cat', | ||
| '<span lang="fr"><b>chien</b></span>', | ||
| '<textarea>evil!</textarea>', | ||
| ], | ||
| ]; | ||
|
|
||
| $errors = $form->validation($submitteddata, []); | ||
|
|
||
| $this->assertArrayNotHasKey('drags[0]', $errors); | ||
| $this->assertEquals('HTML tags are not allowed in this text which is the alt text for a draggable image.', | ||
| $errors['drags[1]']); | ||
| $this->assertArrayNotHasKey('drags[2]', $errors); | ||
| $this->assertArrayNotHasKey('drags[3]', $errors); | ||
| $this->assertEquals('Only "<br><sub><sup><b><i><strong><em><span>" ' . | ||
| 'tags are allowed in this draggable text.', $errors['drags[4]']); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| <?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 the drag-and-drop markers edit form. | ||
| * | ||
| * @package qtype_ddmarker | ||
| * @copyright 2019 The Open University | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| defined('MOODLE_INTERNAL') || die(); | ||
| global $CFG; | ||
|
|
||
| require_once($CFG->dirroot . '/question/engine/tests/helpers.php'); | ||
| require_once($CFG->dirroot . '/question/type/edit_question_form.php'); | ||
| require_once($CFG->dirroot . '/question/type/ddmarker/edit_ddmarker_form.php'); | ||
|
|
||
| /** | ||
| * Unit tests for the drag-and-drop markers edit form. | ||
| * | ||
| * @copyright 2019 The Open University | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
| class qtype_ddmarker_edit_form_test extends advanced_testcase { | ||
| /** | ||
| * Helper method. | ||
| * | ||
| * @return array with two elements: | ||
| * question_edit_form great a question form instance that can be tested. | ||
| * stdClass the question category. | ||
| */ | ||
| protected function get_form() { | ||
| $this->setAdminUser(); | ||
| $this->resetAfterTest(); | ||
|
|
||
| $syscontext = context_system::instance(); | ||
| $category = question_make_default_categories(array($syscontext)); | ||
| $fakequestion = new stdClass(); | ||
| $fakequestion->qtype = 'ddmarker'; | ||
| $fakequestion->contextid = $syscontext->id; | ||
| $fakequestion->createdby = 2; | ||
| $fakequestion->category = $category->id; | ||
| $fakequestion->questiontext = 'Test question'; | ||
| $fakequestion->options = new stdClass(); | ||
| $fakequestion->options->answers = array(); | ||
| $fakequestion->formoptions = new stdClass(); | ||
| $fakequestion->formoptions->movecontext = null; | ||
| $fakequestion->formoptions->repeatelements = true; | ||
| $fakequestion->inputs = null; | ||
|
|
||
| $form = new qtype_ddmarker_edit_form(new moodle_url('/'), $fakequestion, $category, | ||
| new question_edit_contexts($syscontext)); | ||
|
|
||
| return [$form, $category]; | ||
| } | ||
|
|
||
| /** | ||
| * Test the form correctly validates the HTML allowed in items. | ||
| */ | ||
| public function test_item_validation() { | ||
| list($form, $category) = $this->get_form(); | ||
|
|
||
| $submitteddata = [ | ||
| 'category' => $category->id, | ||
| 'bgimage' => 0, | ||
| 'nodropzone' => 0, | ||
| 'noitems' => 4, | ||
| 'drags' => [ | ||
| ['label' => 'frog'], | ||
| ['label' => '<b>toad</b>'], | ||
| ['label' => '<span lang="fr"><em>chien</em></span>'], | ||
| ['label' => '<textarea>evil!</textarea>'], | ||
| ], | ||
| ]; | ||
|
|
||
| $errors = $form->validation($submitteddata, []); | ||
|
|
||
| $this->assertArrayNotHasKey('drags[0]', $errors); | ||
| $this->assertArrayNotHasKey('drags[1]', $errors); | ||
| $this->assertArrayNotHasKey('drags[2]', $errors); | ||
| $this->assertEquals('Only "<br><i><em><b><strong>' . | ||
| '<sup><sub><u><span>" tags are allowed in the label for a marker.', | ||
| $errors['drags[3]']); | ||
| } | ||
| } |
Oops, something went wrong.