adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix errors when testing controllers that use file()

Browse source 
Fix errors related to ob_end_clean() closing PHPUnit's output buffer
when testing controller methods that use response->file().
This commit is contained in:
mark_story 2015-04-09 20:38:37 -04:00
parent a6aefdd4d3
commit 5f2aa4c307
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
View file

@ -300,6 +300,18 @@ class ControllerTestCaseTest extends CakeTestCase {
$this->assertSame(302, $Controller->response->statusCode()); $this->assertSame(302, $Controller->response->statusCode());
} }
/**
* Test that file responses don't trigger errors.
*
* @return void
*/
public function testActionWithFile() {
$Controller = $this->Case->generate('TestsApps');
$this->Case->testAction('/tests_apps/file');
$this->assertArrayHasKey('Content-Disposition', $Controller->response->header());
$this->assertArrayHasKey('Content-Length', $Controller->response->header());
}
/** /**
* Make sure testAction() can hit plugin controllers. * Make sure testAction() can hit plugin controllers.
* *

4
lib/Cake/Test/test_app/Controller/TestsAppsController.php
View file

@ -44,6 +44,10 @@ class TestsAppsController extends AppController {
$this->render('index'); $this->render('index');
} }
public function file() {
$this->response->file(__FILE__);
}
public function redirect_to() { public function redirect_to() {
return $this->redirect('http://cakephp.org'); return $this->redirect('http://cakephp.org');
} }

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

@ -271,7 +271,7 @@ abstract class ControllerTestCase extends CakeTestCase {
$params['requested'] = 1; $params['requested'] = 1;
} }
$Dispatch->testController = $this->controller; $Dispatch->testController = $this->controller;
$Dispatch->response = $this->getMock('CakeResponse', array('send')); $Dispatch->response = $this->getMock('CakeResponse', array('send', '_clearBuffer'));
$this->result = $Dispatch->dispatch($request, $Dispatch->response, $params); $this->result = $Dispatch->dispatch($request, $Dispatch->response, $params);
$this->controller = $Dispatch->testController; $this->controller = $Dispatch->testController;
$this->vars = $this->controller->viewVars; $this->vars = $this->controller->viewVars;