ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added validation message to language file for required_with

Browse Source 
Signed-off-by: Jason Walton <jwalton512@gmail.com>
This commit is contained in:
Jason Walton
2012-12-19 12:05:51 -07:00
parent 8ff052cbdb
commit 19cd539586
4 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
laravel/tests/application/language/en/validation.php
View File

@@ -50,6 +50,7 @@ return array(
"not_in" => "The selected :attribute is invalid.",
"numeric" => "The :attribute must be a number.",
"required" => "The :attribute field is required.",
"required_with" => "The :attribute field is required with :field",
"same" => "The :attribute and :other must match.",
"size" => array(
"numeric" => "The :attribute must be :size.",
@@ -93,4 +94,4 @@ return array(
'attributes' => array('test_attribute' => 'attribute'),
);
);

22
laravel/tests/cases/validator.test.php
View File

@@ -666,4 +666,24 @@ class ValidatorTest extends PHPUnit_Framework_TestCase {
$this->assertEquals($expect, $v->errors->first('test_attribute'));
}
}
/**
* Test required_with attribute names are replaced.
*
* @group laravel
*/
public function testRequiredWithAttributesAreReplaced()
{
$lang = require path('app').'language/en/validation.php';
$data = array('first_name' => 'Taylor', 'last_name' => '');
$rules = array('first_name' => 'required', 'last_name' => 'required_with:first_name');
$v = Validator::make($data, $rules);
$v->valid();
$expect = str_replace(array(':attribute', ':field'), array('last name', 'first name'), $lang['required_with']);
$this->assertEquals($expect, $v->errors->first('last_name'));
}
}