php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-27 20:40:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Additional tests in EmailValidator.

Browse Source
This commit is contained in:
Suralc
2013-07-31 21:14:14 +02:00
parent 1c57661e1f
commit 1ce7344e18
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/validators/EmailValidator.php
View File

@@ -64,7 +64,9 @@ class EmailValidator extends Validator
{ {
parent::init(); parent::init();
if ($this->enableIDN && !function_exists('idn_to_ascii')) { if ($this->enableIDN && !function_exists('idn_to_ascii')) {
// @codeCoverageIgnoreStart
throw new InvalidConfigException('In order to use IDN validation intl extension must be installed and enabled.'); throw new InvalidConfigException('In order to use IDN validation intl extension must be installed and enabled.');
// @codeCoverageIgnoreEnd
} }
if ($this->message === null) { if ($this->message === null) {
$this->message = Yii::t('yii', '{attribute} is not a valid email address.'); $this->message = Yii::t('yii', '{attribute} is not a valid email address.');

30
tests/unit/framework/validators/EmailValidatorTest.php
View File

@@ -1,5 +1,6 @@
<?php <?php
namespace yiiunit\framework\validators; namespace yiiunit\framework\validators;
use yii\validators\EmailValidator; use yii\validators\EmailValidator;
use yiiunit\TestCase; use yiiunit\TestCase;
@@ -25,4 +26,33 @@ class EmailValidatorTest extends TestCase
$this->assertTrue($validator->validateValue('5011@gmail.com')); $this->assertTrue($validator->validateValue('5011@gmail.com'));
$this->assertFalse($validator->validateValue('test@example.com')); $this->assertFalse($validator->validateValue('test@example.com'));
} }
public function testValidateAttribute()
{
$val = new EmailValidator();
$model = new FakedValidationModel();
$model->attr_email = '5011@gmail.com';
$val->validateAttribute($model, 'attr_email');
$this->assertFalse($model->hasErrors('attr_email'));
}
public function testValidateValueIdn()
{
if (!function_exists('idn_to_ascii')) {
$this->markTestSkipped('Intl extension required');
return;
}
$val = new EmailValidator(array('enableIDN' => true));
$this->assertTrue($val->validateValue('5011@example.com'));
$this->assertTrue($val->validateValue('example@äüößìà.de'));
$this->assertTrue($val->validateValue('example@xn--zcack7ayc9a.de'));
}
public function testValidateValueWithName()
{
$val = new EmailValidator(array('allowName' => true));
$this->assertTrue($val->validateValue('test@example.com'));
$this->assertTrue($val->validateValue('John Smith <john.smith@example.com>'));
$this->assertFalse($val->validateValue('John Smith <example.com>'));
}
} }