adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing failing tests for ControllerTestCase.

Browse source
This commit is contained in:
mark_story 2011-07-03 20:19:08 -04:00 • committed by mark_story
parent 04147caca8
commit 65d28f4c73
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/TestSuite/ControllerTestCase.php
View file

@ -52,9 +52,9 @@ class ControllerTestDispatcher extends Dispatcher {
* *
* @return Controller * @return Controller
*/ */
function _getController($request) { function _getController($request, $response) {
if ($this->testController === null) { if ($this->testController === null) {
$this->testController = parent::_getController($request); $this->testController = parent::_getController($request, $response);
} }
$this->testController->helpers = array_merge(array('InterceptContent'), $this->testController->helpers); $this->testController->helpers = array_merge(array('InterceptContent'), $this->testController->helpers);
$this->testController->setRequest($request); $this->testController->setRequest($request);
@ -224,7 +224,7 @@ class ControllerTestCase extends CakeTestCase {
} }
$Dispatch->testController = $this->controller; $Dispatch->testController = $this->controller;
$Dispatch->response = $this->getMock('CakeResponse', array('send')); $Dispatch->response = $this->getMock('CakeResponse', array('send'));
$this->result = $Dispatch->dispatch($request, $params); $this->result = $Dispatch->dispatch($request, $Dispatch->response, $params);
$this->controller = $Dispatch->testController; $this->controller = $Dispatch->testController;
if ($options['return'] != 'result') { if ($options['return'] != 'result') {
$this->vars = $this->controller->View->viewVars; $this->vars = $this->controller->View->viewVars;
@ -275,7 +275,9 @@ class ControllerTestCase extends CakeTestCase {
list($plugin, $name) = pluginSplit($controller); list($plugin, $name) = pluginSplit($controller);
$_controller = $this->getMock($name.'Controller', $mocks['methods'], array(), '', false); $_controller = $this->getMock($name.'Controller', $mocks['methods'], array(), '', false);
$_controller->name = $name; $_controller->name = $name;
$_controller->__construct(); $request = $this->getMock('CakeRequest');
$response = $this->getMock('CakeResponse', array('_sendHeader'));
$_controller->__construct($request, $response);
$config = ClassRegistry::config('Model'); $config = ClassRegistry::config('Model');
foreach ($mocks['models'] as $model => $methods) { foreach ($mocks['models'] as $model => $methods) {