Skip to content
Permalink
Browse files

Fixing failing tests in controller test.

  • Loading branch information...
markstory committed Nov 7, 2010
1 parent 88c717d commit 22497eb41c45c91ff8850a674487094259fd50ea
Showing with 2 additions and 1 deletion.
  1. +1 −1 cake/libs/controller/controller.php
  2. +1 −0 cake/tests/cases/libs/controller/controller.test.php
@@ -1039,7 +1039,7 @@ public function paginate($object = null, $scope = array(), $whitelist = array())
), E_USER_WARNING);
return array();
}
$options = array_merge($this->request->params, $this->params['url'], $this->passedArgs);
$options = array_merge($this->request->params, $this->request->params['url'], $this->passedArgs);
if (isset($this->paginate[$object->alias])) {
$defaults = $this->paginate[$object->alias];
@@ -759,6 +759,7 @@ function testPaginateExtraParams() {
function testPaginateFieldsDouble(){
$Controller =& new Controller();
$Controller->uses = array('ControllerPost');
$Controller->request = $this->getMock('CakeRequest');
$Controller->request->params['url'] = array();
$Controller->constructClasses();

0 comments on commit 22497eb

Please sign in to comment.
You can’t perform that action at this time.