|
|
@@ -353,12 +353,18 @@ class PaginatorComponentTest extends CakeTestCase {
|
|
|
$Controller->request->query = array();
|
|
|
$Controller->constructClasses();
|
|
|
|
|
|
- $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
|
|
|
- $this->assertEquals(array(1, 2, 3), $results);
|
|
|
-
|
|
|
+ $Controller->Paginator->settings = array(
|
|
|
+ 'order' => array('PaginatorControllerComment.id' => 'ASC')
|
|
|
+ );
|
|
|
$results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerComment'), '{n}.PaginatorControllerComment.id');
|
|
|
$this->assertEquals(array(1, 2, 3, 4, 5, 6), $results);
|
|
|
|
|
|
+ $Controller->Paginator->settings = array(
|
|
|
+ 'order' => array('PaginatorControllerPost.id' => 'ASC')
|
|
|
+ );
|
|
|
+ $results = Hash::extract($Controller->Paginator->paginate('PaginatorControllerPost'), '{n}.PaginatorControllerPost.id');
|
|
|
+ $this->assertEquals(array(1, 2, 3), $results);
|
|
|
+
|
|
|
$Controller->modelClass = null;
|
|
|
|
|
|
$Controller->uses[0] = 'Plugin.PaginatorControllerPost';
|
|
|
@@ -473,6 +479,9 @@ class PaginatorComponentTest extends CakeTestCase {
|
|
|
$Controller->constructClasses();
|
|
|
|
|
|
$Controller->request->params['named'] = array('page' => '-1', 'contain' => array('PaginatorControllerComment'));
|
|
|
+ $Controller->Paginator->settings = array(
|
|
|
+ 'order' => array('PaginatorControllerPost.id' => 'ASC')
|
|
|
+ );
|
|
|
$result = $Controller->Paginator->paginate('PaginatorControllerPost');
|
|
|
$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
|
|
|
$this->assertEquals(array(1, 2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
|