fix/test non-required empty email validation

adcSTUDIO · Sep 4, 2013 · 208f433 · 208f433
1 parent 36bdf07
commit 208f433
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/tests/validator_tests.php b/tests/validator_tests.php
@@ -75,5 +75,13 @@ public function test_emailvalidator()
 
 		$field->value('[email protected]');
 		$this->assertTrue( $validator->isValid() );
+
+		$field->value('');
+		$this->assertFalse( $validator->isValid(),
+			"Empty value with required should be invalid." );
+
+		$field->required(false);
+		$this->assertTrue( $validator->isValid(),
+			"Empty value without required should be valid." );
 	}
 }
diff --git a/validators.php b/validators.php
@@ -79,7 +79,7 @@ public function isValid()
 		$valid = parent::isValid();
 		$field = $this->field;
 
-		if ( $valid ) {
+		if ( $field->value() ) {
 			if ( !preg_match( self::$email_pattern, $field->value() ) )
 				$this->errors[] = 'not a valid email address';
 		}