Skip to content
Permalink
Browse files

Fix a fatal error occurs in combination with a scaffold error.

  • Loading branch information...
chinpei215 committed Jul 30, 2014
1 parent 4bee5b4 commit f3e1a187400ff577ec5cae9d392b4937ea26fd77
Showing with 76 additions and 3 deletions.
  1. +71 −2 lib/Cake/Test/Case/Controller/ScaffoldTest.php
  2. +5 −1 lib/Cake/View/Errors/scaffold_error.ctp
@@ -63,7 +63,7 @@ class ScaffoldMockControllerWithFields extends Controller {
/**
* function beforeScaffold
*
* @param string method
* @param string $method Method name.
* @return bool true
*/
public function beforeScaffold($method) {
@@ -73,6 +73,39 @@ public function beforeScaffold($method) {
}
/**
* ScaffoldMockControllerWithError class
*
* @package Cake.Test.Case.Controller
*/
class ScaffoldMockControllerWithError extends Controller {
/**
* name property
*
* @var string
*/
public $name = 'ScaffoldMock';
/**
* scaffold property
*
* @var mixed
*/
public $scaffold;
/**
* function beforeScaffold
*
* @param string $method Method name.
* @return bool false
*/
public function beforeScaffold($method) {
return false;
}
}
/**
* TestScaffoldMock class
*
@@ -83,7 +116,7 @@ class TestScaffoldMock extends Scaffold {
/**
* Overload _scaffold
*
* @param CakeRequest $request
* @param CakeRequest $request Request object for scaffolding
* @return void
*/
protected function _scaffold(CakeRequest $request) {
@@ -344,4 +377,40 @@ public function testEditScaffoldWithScaffoldFields() {
$this->assertNotRegExp('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result);
}
/**
* test in case of scaffold error
*
* @return void
*/
public function testScaffoldError() {
$request = new CakeRequest(null, false);
$this->Controller = new ScaffoldMockControllerWithError($request);
$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
$params = array(
'plugin' => null,
'pass' => array(1),
'form' => array(),
'named' => array(),
'url' => array('url' => 'scaffold_mock/edit'),
'controller' => 'scaffold_mock',
'action' => 'edit',
);
$this->Controller->request->base = '';
$this->Controller->request->webroot = '/';
$this->Controller->request->here = '/scaffold_mock/edit';
$this->Controller->request->addParams($params);
//set router.
Router::reload();
Router::setRequestInfo($this->Controller->request);
$this->Controller->constructClasses();
ob_start();
new Scaffold($this->Controller, $this->Controller->request);
$this->Controller->response->send();
$result = ob_get_clean();
$this->assertRegExp('/Scaffold Error/', $result);
}
}
@@ -31,4 +31,8 @@ function _scaffoldError() {<br />

</pre>

<?php echo $this->element('exception_stack_trace'); ?>
<?php
if (isset($error) && $error instanceof Exception) {
echo $this->element('exception_stack_trace');
}
?>

0 comments on commit f3e1a18

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