adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing notice errors when bogus validation options are selected. Refs #453

Browse source
This commit is contained in:
Mark Story 2010-03-12 22:58:14 -05:00
parent 4c668c036c
commit 8e8acfaccd
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/console/libs/tasks/model.php
View file

@ -410,6 +410,10 @@ class ModelTask extends BakeTask {
$this->out(__("You have already chosen that validation rule,\nplease choose again", true)); $this->out(__("You have already chosen that validation rule,\nplease choose again", true));
continue; continue;
} }
if (!isset($this->_validations[$choice])) {
$this->out(__('Please make a valid selection.', true));
continue;
}
$alreadyChosen[] = $choice; $alreadyChosen[] = $choice;
} else { } else {
$choice = $guess; $choice = $guess;

20
cake/tests/cases/console/libs/tasks/model.test.php
View file

@ -42,7 +42,7 @@ Mock::generatePartial(
); );
Mock::generatePartial( Mock::generatePartial(
'ModelTask', 'MockModelTask', 'ModelTask', 'MockModelTask',
array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest') array('in', 'out', 'hr', 'err', 'createFile', '_stop', '_checkUnitTest')
); );
Mock::generate( Mock::generate(
@ -233,6 +233,24 @@ class ModelTaskTest extends CakeTestCase {
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }
/**
* test that a bogus response doesn't cause errors to bubble up.
*
* @return void
*/
function testInteractiveFieldValidationWithBogusResponse() {
$this->Task->initValidations();
$this->Task->interactive = true;
$this->Task->setReturnValueAt(0, 'in', '--bogus--');
$this->Task->setReturnValueAt(1, 'in', '19');
$this->Task->setReturnValueAt(2, 'in', 'n');
$this->Task->expectAt(4, 'out', array(new PatternExpectation('/make a valid/')));
$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
$expected = array('notempty' => 'notempty');
$this->assertEqual($result, $expected);
}
/** /**
* test the validation Generation routine * test the validation Generation routine
* *