php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #7566: Improved \yii\validators\CompareValidator default messages

Browse Source
This commit is contained in:
Sidney Lins (slinstj, former sidtj)
2015-03-21 14:47:35 -03:00
committed by Alexander Makarov
parent bb2bc7008d
commit c33574bc0a
3 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/framework/validators/CompareValidatorTest.php
View File

@ -141,6 +141,50 @@ class CompareValidatorTest extends TestCase
$this->assertTrue($model->hasErrors('attr_o'));
}
public function testAttributeErrorMessages()
{
$model = FakedValidationModel::createWithAttributes([
'attr1' => 1,
'attr2' => 2,
'attrN' => 2,
]);
foreach ($this->getTestDataForMessages() as $data) {
$model->clearErrors($data[0]);
$validator = new CompareValidator();
$validator->operator = $data[1];
$validator->message = null;
$validator->init(); // reload messages
$validator->$data[4] = $data[2];
$validator->validateAttribute($model, $data[0]);
$error = $model->getErrors($data[0])[0];
$this->assertEquals($data[3], $error);
}
}
protected function getTestDataForMessages()
{
return [
['attr1', '==', 2, 'attr1 must be equal to "2".', 'compareValue'],
['attr1', '===', 2, 'attr1 must be equal to "2".', 'compareValue'],
['attrN', '!=', 2, 'attrN must not be equal to "2".', 'compareValue'],
['attrN', '!==', 2, 'attrN must not be equal to "2".', 'compareValue'],
['attr1', '>', 2, 'attr1 must be greater than "2".', 'compareValue'],
['attr1', '>=', 2, 'attr1 must be greater than or equal to "2".', 'compareValue'],
['attr2', '<', 1, 'attr2 must be less than "1".', 'compareValue'],
['attr2', '<=', 1, 'attr2 must be less than or equal to "1".', 'compareValue'],
['attr1', '==', 'attr2', 'attr1 must be equal to "attr2".', 'compareAttribute'],
['attr1', '===', 'attr2', 'attr1 must be equal to "attr2".', 'compareAttribute'],
['attrN', '!=', 'attr2', 'attrN must not be equal to "attr2".', 'compareAttribute'],
['attrN', '!==', 'attr2', 'attrN must not be equal to "attr2".', 'compareAttribute'],
['attr1', '>', 'attr2', 'attr1 must be greater than "attr2".', 'compareAttribute'],
['attr1', '>=', 'attr2', 'attr1 must be greater than or equal to "attr2".', 'compareAttribute'],
['attr2', '<', 'attr1', 'attr2 must be less than "attr1".', 'compareAttribute'],
['attr2', '<=', 'attr1', 'attr2 must be less than or equal to "attr1".', 'compareAttribute'],
];
}
public function testValidateAttributeOperators()
{
$value = 55;