adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always set ControllerTestCase::testAction result variables

Browse source
This commit is contained in:
Kyle Robinson Young 2011-12-02 06:19:15 -08:00
parent ff8eb2bcca
commit 4174ddff0f
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -263,12 +263,10 @@ abstract class ControllerTestCase extends CakeTestCase {
$Dispatch->response = $this->getMock('CakeResponse', array('send')); $Dispatch->response = $this->getMock('CakeResponse', array('send'));
$this->result = $Dispatch->dispatch($request, $Dispatch->response, $params); $this->result = $Dispatch->dispatch($request, $Dispatch->response, $params);
$this->controller = $Dispatch->testController; $this->controller = $Dispatch->testController;
if ($options['return'] != 'result') { $this->vars = $this->controller->viewVars;
if (isset($this->controller->View)) { $this->contents = $this->controller->response->body();
$this->vars = $this->controller->View->viewVars; if (isset($this->controller->View)) {
$this->view = $this->controller->View->_viewNoLayout; $this->view = $this->controller->View->_viewNoLayout;
}
$this->contents = $this->controller->response->body();
} }
$this->__dirtyController = true; $this->__dirtyController = true;
$this->headers = $Dispatch->response->header(); $this->headers = $Dispatch->response->header();