Make sure testRequiredAllowEmpty() tests 2 different usages for required rule

This commit is contained in:
Willem Wollebrants 2017-12-02 21:28:13 +01:00
parent 290113fac0
commit d1563d520f

View File

@ -34,7 +34,7 @@ class ValidateTest extends BaseTestCase
$v->rule('required', array('name', 'email')); $v->rule('required', array('name', 'email'));
$this->assertFalse($v->validate()); $this->assertFalse($v->validate());
} }
public function testRequiredSubfieldsArrayStringValue() public function testRequiredSubfieldsArrayStringValue()
{ {
$v = new Validator(array('name' => 'bob')); $v = new Validator(array('name' => 'bob'));
@ -629,7 +629,7 @@ class ValidateTest extends BaseTestCase
$v->rule('slug', 'test'); $v->rule('slug', 'test');
$this->assertFalse($v->validate()); $this->assertFalse($v->validate());
} }
public function testNoErrorFailOnArray() public function testNoErrorFailOnArray()
{ {
$v = new Validator(array('test' => array())); $v = new Validator(array('test' => array()));
@ -1203,22 +1203,22 @@ class ValidateTest extends BaseTestCase
public function testOptionalProvidedValid() public function testOptionalProvidedValid()
{ {
$v = new Validator(array('address' => 'user@example.com')); $v = new Validator(array('address' => 'user@example.com'));
$v->rule('optional', 'address')->rule('email', 'address'); $v->rule('optional', 'address')->rule('email', 'address');
$this->assertTrue($v->validate()); $this->assertTrue($v->validate());
} }
public function testOptionalProvidedInvalid() public function testOptionalProvidedInvalid()
{ {
$v = new Validator(array('address' => 'userexample.com')); $v = new Validator(array('address' => 'userexample.com'));
$v->rule('optional', 'address')->rule('email', 'address'); $v->rule('optional', 'address')->rule('email', 'address');
$this->assertFalse($v->validate()); $this->assertFalse($v->validate());
} }
public function testOptionalNotProvided() public function testOptionalNotProvided()
{ {
$v = new Validator(array()); $v = new Validator(array());
$v->rule('optional', 'address')->rule('email', 'address'); $v->rule('optional', 'address')->rule('email', 'address');
$this->assertTrue($v->validate()); $this->assertTrue($v->validate());
} }
@ -1268,8 +1268,8 @@ class ValidateTest extends BaseTestCase
$this->assertFalse($v1->validate()); $this->assertFalse($v1->validate());
$v2= new Validator($data); $v2= new Validator($data);
$v2->rule('required', array('empty_text', 'null_value', 'in_array.empty_text')); $v2->rule('required', array('empty_text', 'null_value', 'in_array.empty_text'), true);
$this->assertFalse($v2->validate()); $this->assertTrue($v2->validate());
} }
} }