Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing problems when running the AllTests testsuite

  • Loading branch information...
commit e758b272bd48dbea9b35325e990ad9e1300ee847 1 parent 33c74b6
@lorenzo lorenzo authored
View
8 lib/Cake/Model/Model.php
@@ -2584,6 +2584,10 @@ function invalidFields($options = array()) {
}
$validator = array_merge($default, $validator);
+ $validationDomain = $this->validationDomain;
+ if (empty($validationDomain)) {
+ $validationDomain = 'default';
+ }
if (isset($validator['message'])) {
$message = $validator['message'];
} else {
@@ -2603,7 +2607,7 @@ function invalidFields($options = array()) {
);
if ($required) {
- $this->invalidate($fieldName, $message);
+ $this->invalidate($fieldName, __d($validationDomain, $message));
if ($validator['last']) {
break;
}
@@ -2647,7 +2651,7 @@ function invalidFields($options = array()) {
} elseif (is_numeric($index) && count($ruleSet) > 1) {
$validator['message'] = $index + 1;
} else {
- $validator['message'] = $message;
+ $validator['message'] = __d($validationDomain, $message);
}
}
$this->invalidate($fieldName, $validator['message']);
View
6 lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
@@ -239,7 +239,7 @@ public function testExtractModelValidation() {
App::build(array(
'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
- ));
+ ), App::RESET);
$this->out = $this->getMock('ConsoleOutput', array(), array(), '', false);
$this->in = $this->getMock('ConsoleInput', array(), array(), '', false);
$this->Task = $this->getMock('ExtractTask',
@@ -256,10 +256,10 @@ public function testExtractModelValidation() {
$this->Task->execute();
$result = file_get_contents($this->path . DS . 'default.pot');
- $pattern = '#Model/Post.php:validation for field title#';
+ $pattern = '#Model/PersisterOne.php:validation for field title#';
$this->assertPattern($pattern, $result);
- $pattern = '#Model/Post.php:validation for field body#';
+ $pattern = '#Model/PersisterOne.php:validation for field body#';
$this->assertPattern($pattern, $result);
$pattern = '#msgid "Post title is required"#';
View
22 lib/Cake/Test/test_app/Model/PersisterOne.php
@@ -25,4 +25,26 @@ class PersisterOne extends AppModel {
public $actsAs = array('PersisterOneBehavior', 'TestPlugin.TestPluginPersisterOne');
public $hasMany = array('Comment', 'TestPlugin.TestPluginComment');
+ public $validate = array(
+ 'title' => array(
+ 'rule' => array('custom', '.*'),
+ 'allowEmpty' => true,
+ 'required' => false,
+ 'message' => 'Post title is required'
+ ),
+ 'body' => array(
+ 'first_rule' => array(
+ 'rule' => array('custom', '.*'),
+ 'allowEmpty' => true,
+ 'required' => false,
+ 'message' => 'Post body is required'
+ ),
+ 'second_rule' => array(
+ 'rule' => array('custom', '.*'),
+ 'allowEmpty' => true,
+ 'required' => false,
+ 'message' => 'Post body is super required'
+ )
+ ),
+ );
}
View
22 lib/Cake/Test/test_app/Model/Post.php
@@ -21,26 +21,4 @@
class Post extends AppModel {
public $useTable = 'posts';
public $name = 'Post';
- public $validate = array(
- 'title' => array(
- 'rule' => array('custom', '.*'),
- 'allowEmpty' => true,
- 'required' => false,
- 'message' => 'Post title is required'
- ),
- 'body' => array(
- 'first_rule' => array(
- 'rule' => array('custom', '.*'),
- 'allowEmpty' => true,
- 'required' => false,
- 'message' => 'Post body is required'
- ),
- 'second_rule' => array(
- 'rule' => array('custom', '.*'),
- 'allowEmpty' => true,
- 'required' => false,
- 'message' => 'Post body is super required'
- )
- ),
- );
}
Please sign in to comment.
Something went wrong with that request. Please try again.