Improving tests for BelongsTo

cakephp · May 12, 2013 · a778589 · a778589
1 parent e4c8668
commit a778589
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/Cake/ORM/Association/BelongsTo.php b/lib/Cake/ORM/Association/BelongsTo.php
@@ -80,7 +80,7 @@ public function attachTo(Query $query, array $options = []) {
 		if (!empty($options['foreignKey'])) {
 			$options['conditions'][] =  sprintf('%s.%s = %s.%s',
 				$target->alias(),
-				$source->primaryKey(),
+				$target->primaryKey(),
 				$source->alias(),
 				$options['foreignKey']
 			);

diff --git a/lib/Cake/Test/TestCase/ORM/Association/BelongsToTest.php b/lib/Cake/Test/TestCase/ORM/Association/BelongsToTest.php
@@ -96,7 +96,7 @@ public function testAttachTo() {
 
 /**
  * Tests that default config defined in the association can be overridden
- * 
+ *
  * @return void
  */
 	public function testAttachToConfigOverride() {
@@ -132,7 +132,6 @@ public function testAttachToConfigOverride() {
 	public function testAttachToNoFields() {
 		$query = $this->getMock('\Cake\ORM\Query', ['join', 'select'], [null]);
 		$config = [
-			'foreignKey' => 'company_id',
 			'sourceTable' => $this->client,
 			'targetTable' => $this->company,
 			'conditions' => ['Company.is_active' => true]