mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-38897-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-04-05 03:21:52 +02:00
commit 577173a51f
2 changed files with 80 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/formslib.php
View File

@ -916,8 +916,6 @@ abstract class moodleform {
$this->definition_after_data();
}
$this->detectMissingSetType();
$this->_form->display();
}

81
lib/tests/formslib_test.php
View File

@ -32,7 +32,7 @@ require_once($CFG->libdir . '/form/select.php');
require_once($CFG->libdir . '/form/text.php');
class formslib_testcase extends basic_testcase {
class formslib_testcase extends advanced_testcase {
public function test_require_rule() {
global $CFG;
@ -190,6 +190,41 @@ class formslib_testcase extends basic_testcase {
$this->assertTag(array('tag'=>'input', 'id'=>'id_repeatradio_2_2',
'attributes'=>array('type'=>'radio', 'name'=>'repeatradio[2]', 'value'=>'2')), $html);
}
public function test_settype_debugging_text() {
$mform = new formslib_settype_debugging_text();
$this->assertDebuggingCalled("Did you remember to call setType() for 'texttest'? Defaulting to PARAM_RAW cleaning.");
// Check form still there though
$this->expectOutputRegex('/<input[^>]*name="texttest[^>]*type="text/');
$mform->display();
}
public function test_settype_debugging_hidden() {
$mform = new formslib_settype_debugging_hidden();
$this->assertDebuggingCalled("Did you remember to call setType() for 'hiddentest'? Defaulting to PARAM_RAW cleaning.");
// Check form still there though
$this->expectOutputRegex('/<input[^>]*name="hiddentest[^>]*type="hidden/');
$mform->display();
}
public function test_settype_debugging_repeat() {
$mform = new formslib_settype_debugging_repeat();
$this->assertDebuggingCalled("Did you remember to call setType() for 'repeattest'? Defaulting to PARAM_RAW cleaning.");
// Check form still there though
$this->expectOutputRegex('/<input[^>]*name="repeattest[^>]*type="text/');
$mform->display();
}
public function test_settype_debugging_repeat_ok() {
$mform = new formslib_settype_debugging_repeat_ok();
// No debugging expected here.
$this->expectOutputRegex('/<input[^>]*name="repeattest[^>]*type="text/');
$mform->display();
}
}
@ -223,3 +258,47 @@ class formslib_test_form extends moodleform {
$this->repeat_elements($repeatels, 3, array(), 'numradios', 'addradios');
}
}
// Used to test debugging is called when text added without setType.
class formslib_settype_debugging_text extends moodleform {
public function definition() {
$mform = $this->_form;
$mform->addElement('text', 'texttest', 'test123', 'testing123');
}
}
// Used to test debugging is called when hidden added without setType.
class formslib_settype_debugging_hidden extends moodleform {
public function definition() {
$mform = $this->_form;
$mform->addElement('hidden', 'hiddentest', '1');
}
}
// Used to test debugging is called when repeated text added without setType.
class formslib_settype_debugging_repeat extends moodleform {
public function definition() {
$mform = $this->_form;
$repeatels = array(
$mform->createElement('text', 'repeattest', 'Type something')
);
$this->repeat_elements($repeatels, 1, array(), 'numtexts', 'addtexts');
}
}
// Used to no debugging is called when correctly tset
class formslib_settype_debugging_repeat_ok extends moodleform {
public function definition() {
$mform = $this->_form;
$repeatels = array(
$mform->createElement('text', 'repeattest', 'Type something')
);
$this->repeat_elements($repeatels, 2, array('repeattest' => array('type' => PARAM_RAW)), 'numtexts', 'addtexts');
}
}