Skip to content

Y
yii2
Commit 5bbceebc by Carsten Brandt
Options

Merge pull request #2705 from RusAlex/140311_tabs_vs_spaces

tabs vs spaces
parents 7870d02e b9c08712
Showing with 63 additions and 63 deletions
tests/unit/data/validators/models/FakedValidationModel.php
...@@ -30,8 +30,8 @@ class FakedValidationModel extends Model ...@@ -30,8 +30,8 @@ class FakedValidationModel extends Model
return [ return [
[['val_attr_a', 'val_attr_b'], 'required', 'on' => 'reqTest'], [['val_attr_a', 'val_attr_b'], 'required', 'on' => 'reqTest'],
['val_attr_c', 'integer'], ['val_attr_c', 'integer'],
['attr_images', 'file', 'maxFiles' => 3, 'types' => ['png'], 'on' => 'validateMultipleFiles'], ['attr_images', 'file', 'maxFiles' => 3, 'types' => ['png'], 'on' => 'validateMultipleFiles'],
['attr_image', 'file', 'types' => ['png'], 'on' => 'validateFile'] ['attr_image', 'file', 'types' => ['png'], 'on' => 'validateFile']
]; ];
} }
......
tests/unit/framework/validators/FileValidatorTest.php
...@@ -107,68 +107,68 @@ class FileValidatorTest extends TestCase ...@@ -107,68 +107,68 @@ class FileValidatorTest extends TestCase
$val->validateAttribute($m, 'attr_files'); $val->validateAttribute($m, 'attr_files');
$this->assertTrue($m->hasErrors()); $this->assertTrue($m->hasErrors());
$this->assertTrue(stripos(current($m->getErrors('attr_files')), 'you can upload at most') !== false); $this->assertTrue(stripos(current($m->getErrors('attr_files')), 'you can upload at most') !== false);
$m = FakedValidationModel::createWithAttributes(
[
'attr_images' => $this->createTestFiles(
[
[
'name' => 'image.png',
'size' => 1024,
'type' => 'image/png'
],
[
'name' => 'image.png',
'size' => 1024,
'type' => 'image/png'
],
[
'name' => 'text.txt',
'size' => 1024
],
]
)
]
);
$m->setScenario('validateMultipleFiles');
$this->assertFalse($m->validate());
$this->assertTrue(stripos(current($m->getErrors('attr_images')),
'Only files with these extensions are allowed') !== false);
$m = FakedValidationModel::createWithAttributes( $m = FakedValidationModel::createWithAttributes(
[ [
'attr_images' => $this->createTestFiles( 'attr_images' => $this->createTestFiles(
[ [
[ [
'name' => 'image.png', 'name' => 'image.png',
'size' => 1024, 'size' => 1024,
'type' => 'image/png' 'type' => 'image/png'
], ],
[ [
'name' => 'image.png', 'name' => 'image.png',
'size' => 1024, 'size' => 1024,
'type' => 'image/png' 'type' => 'image/png'
], ],
[ ]
'name' => 'text.txt', )
'size' => 1024 ]
], );
] $m->setScenario('validateMultipleFiles');
) $this->assertTrue($m->validate());
]
); $m = FakedValidationModel::createWithAttributes(
$m->setScenario('validateMultipleFiles'); [
$this->assertFalse($m->validate()); 'attr_image' => $this->createTestFiles(
$this->assertTrue(stripos(current($m->getErrors('attr_images')), 'Only files with these extensions are allowed') !== false); [
[
$m = FakedValidationModel::createWithAttributes( 'name' => 'text.txt',
[ 'size' => 1024,
'attr_images' => $this->createTestFiles( ],
[ ]
[ )
'name' => 'image.png', ]
'size' => 1024, );
'type' => 'image/png' $m->setScenario('validateFile');
], $this->assertFalse($m->validate());
[
'name' => 'image.png',
'size' => 1024,
'type' => 'image/png'
],
]
)
]
);
$m->setScenario('validateMultipleFiles');
$this->assertTrue($m->validate());
$m = FakedValidationModel::createWithAttributes(
[
'attr_image' => $this->createTestFiles(
[
[
'name' => 'text.txt',
'size' => 1024,
],
]
)
]
);
$m->setScenario('validateFile');
$this->assertFalse($m->validate());
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment