Fixing yet another issue related to beforeValidate and

validateAssociated
cakephp · Jun 6, 2012 · 111a232 · 111a232
1 parent 8966f1b
commit 111a232
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -2357,7 +2357,9 @@ public function validateAssociated(&$data, $options = array()) {
 					if ($options['deep']) {
 						$validates = $this->{$association}->validateAssociated($values, $options);
 					} else {
-						$validates = $this->{$association}->create($values) !== null && $this->{$association}->validates($options);
+						$this->{$association}->create(null);
+						$validates = $this->{$association}->set($values) && $this->{$association}->validates($options);
+						$data[$association] = $this->{$association}->data[$this->{$association}->alias];
 					}
 					if (is_array($validates)) {
 						if (in_array(false, $validates, true)) {

diff --git a/lib/Cake/Test/Case/Model/ModelValidationTest.php b/lib/Cake/Test/Case/Model/ModelValidationTest.php
@@ -1127,4 +1127,34 @@ public function testFirstWithDefaults() {
 		$this->assertEquals($expected['Article'], $result['Article']);
 	}
 
+/**
+ * Tests that altering data in a beforeValidate callback will lead to saving those
+ * values in database, this time with belongsTo associations
+ *
+ * @return void
+ */
+	public function testValidateFirstAssociatedWithBeforeValidate2() {
+		$this->loadFixtures('Article', 'User');
+		$model = new CustomArticle();
+		$model->validate = array(
+			'title' => array(
+				'notempty' => array(
+					'rule' => 'notEmpty',
+					'required' => true
+				)
+			)
+		);
+
+		$data = array(
+			'User' => array('user' => 'foo', 'password' => 'bar'),
+			'CustomArticle' => array(
+				'body' => 'a test'
+			)
+		);
+		$result = $model->saveAll($data, array('validate' => 'first'));
+		$this->assertTrue($result);
+
+		$this->assertEquals('foo', $model->field('title', array('body' => 'a test')));
+	}
+
 }
diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php
@@ -5947,6 +5947,7 @@ public function testSaveManyValidateFirstAtomicFalse() {
  * @return void
  */
 	public function testValidateAssociated() {
+		$this->loadFixtures('Attachment', 'Article', 'Comment');
 		$TestModel = new Comment();
 		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');