Added tests for the new feature.

davidyell · Sep 1, 2014 · 9da43fa · 9da43fa
1 parent dc9ce88
commit 9da43fa
Showing 1 changed file with 33 additions and 12 deletions.
diff --git a/Test/Case/Model/Behavior/ListableBehaviorTest.php b/Test/Case/Model/Behavior/ListableBehaviorTest.php
@@ -26,12 +26,44 @@ class ListableBehaviorTest extends CakeTestCase {
  */
     public $autoFixtures = false;
 
+/**
+ * Provide various configurations to the custom finder
+ *
+ * @return array
+ */
+	public function customFindProvider() {
+		return [
+			[
+				[],
+				[
+					'contain' => [
+						'RelatedModel' => [
+							'fields' => ['id', 'name']
+						]
+					]
+				]
+			],
+			[
+				['fields' => ['id', 'title']],
+				[
+					'fields' => ['id', 'title'],
+					'contain' => [
+						'RelatedModel' => [
+							'fields' => ['id', 'name']
+						]
+					]
+				]
+			]
+		];
+	}
+
 /**
  * Make sure that the custom find method appends the conditions
  *
+ * @dataProvider customFindProvider
  * @return void
  */
-    public function testCustomFind() {
+    public function testCustomFind($query, $expected) {
         $this->Model = new Model();
         $this->Model->useTable = false;
         $this->Model->primaryKey = 'id';
@@ -44,19 +76,8 @@ public function testCustomFind() {
         );
 
         $state = 'before';
-        $query = array();
-
-        $expected = array(
-            'fields' => array('id', 'display'),
-            'contain' => array(
-                'RelatedModel' => array(
-                    'fields' => array('id','name')
-                )
-            )
-        );
 
         $result = $this->Model->_findListing($state, $query);
-
         $this->assertEqual($result, $expected);
     }