Completing test and refactoring

cakephp · Jan 26, 2014 · 878b587 · 878b587
1 parent b0dc5e6
commit 878b587
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 31 deletions.
diff --git a/tests/Fixture/TranslateFixture.php b/tests/Fixture/TranslateFixture.php
@@ -74,5 +74,6 @@ class TranslateFixture extends TestFixture {
 		array('locale' => 'eng', 'model' => 'Comments', 'foreign_key' => 2, 'field' => 'comment', 'content' => 'Comment #2'),
 		array('locale' => 'eng', 'model' => 'Comments', 'foreign_key' => 3, 'field' => 'comment', 'content' => 'Comment #3'),
 		array('locale' => 'eng', 'model' => 'Comments', 'foreign_key' => 4, 'field' => 'comment', 'content' => 'Comment #4'),
+		array('locale' => 'spa', 'model' => 'Comments', 'foreign_key' => 4, 'field' => 'comment', 'content' => 'Comentario #4'),
 	);
 }
diff --git a/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php b/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php
@@ -42,6 +42,24 @@ public function tearDown() {
 		TableRegistry::clear();
 	}
 
+
+/**
+ * Returns an array with all the translations found for a set of records
+ *
+ * @return Collection
+ */
+	protected function _extractTranslations($data) {
+		return (new Collection($data))->map(function($row) {
+			$translations = $row->get('_translations');
+			if (!$translations) {
+				return [];
+			}
+			return array_map(function($t) {
+				return $t->toArray();
+			}, $translations);
+		});
+	}
+
 /**
  * Tests that fields from a translated model are overriden
  *
@@ -143,17 +161,8 @@ public function testFindTranslations() {
 			]
 		];
 
-		$translations = $results->map(function($row) {
-			$translations = $row->get('_translations');
-			if (!$translations) {
-				return [];
-			}
-			return array_map(function($t) {
-				return $t->toArray();
-			}, $translations);
-		});
+		$translations = $this->_extractTranslations($results);
 		$this->assertEquals($expected, $translations->toArray());
-
 		$expected = [
 			1 => ['First Article' => 'First Article Body'],
 			2 => ['Second Article' => 'Second Article Body'],
@@ -188,15 +197,7 @@ public function testFindFilteredTranslations() {
 			]
 		];
 
-		$translations = $results->map(function($row) {
-			$translations = $row->get('_translations');
-			if (!$translations) {
-				return [];
-			}
-			return array_map(function($t) {
-				return $t->toArray();
-			}, $translations);
-		});
+		$translations = $this->_extractTranslations($results);
 		$this->assertEquals($expected, $translations->toArray());
 
 		$expected = [
@@ -258,15 +259,7 @@ public function testFindTranslationsWithFieldOverriding() {
 			]
 		];
 
-		$translations = $results->map(function($row) {
-			$translations = $row->get('_translations');
-			if (!$translations) {
-				return [];
-			}
-			return array_map(function($t) {
-				return $t->toArray();
-			}, $translations);
-		});
+		$translations = $this->_extractTranslations($results);
 		$this->assertEquals($expected, $translations->toArray());
 
 		$expected = [
@@ -308,6 +301,11 @@ public function testFindSingleLocaleHasMany() {
 		$this->assertEquals($expected, $list->combine('id', 'comment')->toArray());
 	}
 
+/**
+ * Test that it is possible to bring translations from hasMany relations
+ *
+ * @return void
+ */
 	public function testTranslationsHasMany() {
 		$table = TableRegistry::get('Articles');
 		$table->addBehavior('Translate', ['fields' => ['title', 'body']]);
@@ -317,14 +315,29 @@ public function testTranslationsHasMany() {
 
 		$results = $table->find('translations')->contain([
 			'Comments' => function($q) {
-				debug(\Cake\Utility\Debugger::trace());
 				return $q->find('translations')->select(['id', 'comment', 'article_id']);
 			}
 		]);
 
+		$comments = $results->first()->comments;
+		$expected = [
+			[
+				'eng' => ['comment' => 'Comment #1', 'locale' => 'eng']
+			],
+			[
+				'eng' => ['comment' => 'Comment #2', 'locale' => 'eng']
+			],
+			[
+				'eng' => ['comment' => 'Comment #3', 'locale' => 'eng']
+			],
+			[
+				'eng' => ['comment' => 'Comment #4', 'locale' => 'eng'],
+				'spa' => ['comment' => 'Comentario #4', 'locale' => 'spa']
+			]
+		];
 
-		$article = $results->first();
-		debug(json_encode($article, JSON_PRETTY_PRINT));
+		$translations = $this->_extractTranslations($comments);
+		$this->assertEquals($expected, $translations->toArray());
 	}
 
 }