Fixed broken tests

cakephp · Sep 22, 2014 · 0c2f466 · 0c2f466
1 parent 732556f
commit 0c2f466
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Datasource/QueryTrait.php b/src/Datasource/QueryTrait.php
@@ -414,7 +414,7 @@ protected function _decorateResults($result) {
 		}
 
 		if ($this->bufferResults()) {
-			$result = $result->buffered();
+			$result = new $decorator($result->buffered());
 		}
 
 		return $result;

diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php
@@ -660,10 +660,10 @@ public function testPaginate() {
 		$this->assertArrayNotHasKey('Paginator', $Controller->helpers);
 
 		$results = $Controller->paginate('Posts');
-		$this->assertInstanceOf('Cake\ORM\ResultSet', $results);
+		$this->assertInstanceOf('Cake\Datasource\ResultSetDecorator', $results);
 
 		$results = $Controller->paginate(TableRegistry::get('Posts'));
-		$this->assertInstanceOf('Cake\ORM\ResultSet', $results);
+		$this->assertInstanceOf('Cake\Datasource\ResultSetDecorator', $results);
 
 		$this->assertSame($Controller->request->params['paging']['Posts']['page'], 1);
 		$this->assertSame($Controller->request->params['paging']['Posts']['pageCount'], 1);
@@ -686,7 +686,7 @@ public function testPaginateUsesModelClass() {
 		$Controller->modelClass = 'Posts';
 		$results = $Controller->paginate();
 
-		$this->assertInstanceOf('Cake\ORM\ResultSet', $results);
+		$this->assertInstanceOf('Cake\Datasource\ResultSetDecorator', $results);
 	}
 
 /**

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -1537,7 +1537,7 @@ public function testCacheWriteIntegration() {
 			->method('write')
 			->with(
 				'my_key',
-				$this->isInstanceOf('Cake\ORM\ResultSet')
+				$this->isInstanceOf('Cake\Datasource\ResultSetDecorator')
 			);
 
 		$query->cache('my_key', $cacher)