Fixing some tests

cakephp · Jan 27, 2014 · fd6a5db · fd6a5db
1 parent 7d397bc
commit fd6a5db
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 19 deletions.
diff --git a/src/Model/Behavior/TranslateBehavior.php b/src/Model/Behavior/TranslateBehavior.php
@@ -256,6 +256,7 @@ protected function _groupTranslations($results) {
 			$options = ['setter' => false, 'guard' => false];
 			$row->set('_translations', $result, $options);
 			unset($row['_i18n']);
+			$row->clean();
 			return $row;
 		});
 	}

diff --git a/src/ORM/Association/HasMany.php b/src/ORM/Association/HasMany.php
@@ -84,6 +84,7 @@ public function eagerLoader(array $options) {
 			'strategy' => $this->strategy()
 		];
 
+		$queryBuilder = false;
 		if (!empty($options['queryBuilder'])) {
 			$queryBuilder = $options['queryBuilder'];
 			unset($options['queryBuilder']);

diff --git a/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php b/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php
@@ -394,20 +394,4 @@ public function testTranslationsHasManyWithOverride() {
 		$this->assertEquals('Obsah #1', $results->first()->body);
 	}
 
-	public function testFindSingleLocaleBelongsto() {
-		$table = TableRegistry::get('Articles');
-		$table->addBehavior('Translate', ['fields' => ['title', 'body']]);
-		$authors = $table->belongsTo('Authors')->target();
-		$authors->addBehavior('Translate', ['fields' => ['name']]);
-
-		$table->locale('eng');
-		$authors->locale('eng');
-
-		$results = $table->find()->contain(['Authors' => function($q) {
-			return $q->select(['id', 'name']);
-		}]);
-
-		debug(json_encode($results->first()->author));
-	}
-
 }
diff --git a/tests/TestCase/ORM/Association/HasManyTest.php b/tests/TestCase/ORM/Association/HasManyTest.php
@@ -396,9 +396,7 @@ public function testEagerLoaderWithQueryBuilder() {
 			->with(['a', 'b'])
 			->will($this->returnSelf());
 
-		$query->expects($this->any())->method('join')
-			->will($this->returnSelf());
-		$query->expects($this->at(6))->method('join')
+		$query->expects($this->at(3))->method('join')
 			->with('foo')
 			->will($this->returnSelf());