mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-09-06 11:32:40 +00:00
fixing issue with sort in pagination and adding tests, removes previously deprecated controller methods and adds trigger_error to recent ones
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7276 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
5e92674990
commit
1576a83505
2 changed files with 29 additions and 23 deletions
|
@ -303,6 +303,26 @@ class ControllerTest extends CakeTestCase {
|
|||
$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
|
||||
$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
|
||||
$this->assertEqual($results, array(1, 2, 3));
|
||||
|
||||
$Controller->passedArgs = array('sort' => 'ControllerPost.id', 'direction' => 'asc');
|
||||
$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
|
||||
$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
|
||||
$this->assertEqual($results, array(1, 2, 3));
|
||||
|
||||
$Controller->passedArgs = array('sort' => 'ControllerPost.id', 'direction' => 'desc');
|
||||
$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
|
||||
$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
|
||||
$this->assertEqual($results, array(3, 2, 1));
|
||||
|
||||
$Controller->passedArgs = array('sort' => 'id', 'direction' => 'desc');
|
||||
$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
|
||||
$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
|
||||
$this->assertEqual($results, array(3, 2, 1));
|
||||
|
||||
$Controller->passedArgs = array('sort' => 'NotExisting.field', 'direction' => 'desc');
|
||||
$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
|
||||
$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
|
||||
$this->assertEqual($results, array(1, 2, 3));
|
||||
}
|
||||
/**
|
||||
* testPaginateExtraParams method
|
||||
|
@ -446,17 +466,6 @@ class ControllerTest extends CakeTestCase {
|
|||
$this->assertTrue($Controller->_afterScaffoldSaveError(''));
|
||||
$this->assertFalse($Controller->_scaffoldError(''));
|
||||
}
|
||||
/**
|
||||
* testCleanUpFields method
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function testCleanUpFields() {
|
||||
$Controller =& new Controller();
|
||||
$Controller->cleanUpFields();
|
||||
$this->assertError();
|
||||
}
|
||||
/**
|
||||
* testRedirect method
|
||||
*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue