mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Adding changes to error.test.php that did not merge properly in last commit
Fixes #4883 for real this time git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7170 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut
parent
8a30290862
commit
04343b8bc0
1 changed files with 74 additions and 159 deletions
|
|
@ -35,12 +35,12 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
|
|||
define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
|
||||
}
|
||||
/**
|
||||
* OrangeComponent class
|
||||
* BlueberryComponent class
|
||||
*
|
||||
* @package cake
|
||||
* @subpackage cake.tests.cases.libs
|
||||
*/
|
||||
class OrangeComponent extends Object {
|
||||
class BlueberryComponent extends Object {
|
||||
/**
|
||||
* testName property
|
||||
*
|
||||
|
|
@ -55,9 +55,8 @@ class OrangeComponent extends Object {
|
|||
* @return void
|
||||
*/
|
||||
function initialize(&$controller) {
|
||||
$this->testName = 'OrangeComponent';
|
||||
$this->testName = 'BlueberryComponent';
|
||||
}
|
||||
|
||||
}
|
||||
/**
|
||||
* AppController class
|
||||
|
|
@ -72,45 +71,24 @@ if (!class_exists('AppController')) {
|
|||
* @package cake
|
||||
* @subpackage cake.tests.cases.libs
|
||||
*/
|
||||
class AppController extends Controller {
|
||||
/**
|
||||
class AppController extends Controller {
|
||||
/**
|
||||
* components property
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
var $components = array('Orange');
|
||||
/**
|
||||
* beforeFilter method
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function beforeFilter() {
|
||||
$this->cakeError('error404', array('oops' => 'Nothing to see here'));
|
||||
}
|
||||
/**
|
||||
var $components = array('Blueberry');
|
||||
/**
|
||||
* beforeRender method
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function beforeRender() {
|
||||
echo $this->Orange->testName;
|
||||
echo $this->Blueberry->testName;
|
||||
}
|
||||
/**
|
||||
* cakeError method
|
||||
*
|
||||
* @param mixed $method
|
||||
* @param array $messages
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function cakeError($method, $messages = array()) {
|
||||
$error =& new TestErrorHandler($method, $messages);
|
||||
return $error;
|
||||
}
|
||||
/**
|
||||
/**
|
||||
* header method
|
||||
*
|
||||
* @access public
|
||||
|
|
@ -119,7 +97,7 @@ if (!class_exists('AppController')) {
|
|||
function header($header) {
|
||||
echo $header;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* TestErrorController class
|
||||
|
|
@ -179,26 +157,6 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
function skip() {
|
||||
$this->skipif ((php_sapi_name() == 'cli'), 'TestErrorHandlerTest cannot be run from console');
|
||||
}
|
||||
/**
|
||||
* testFromBeforeFilter method
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function testFromBeforeFilter() {
|
||||
if (!class_exists('dispatcher')) {
|
||||
require CAKE . 'dispatcher.php';
|
||||
}
|
||||
$Dispatcher =& new Dispatcher();
|
||||
|
||||
restore_error_handler();
|
||||
ob_start();
|
||||
$controller = $Dispatcher->dispatch('/test_error', array('return'=> 1));
|
||||
$expected = ob_get_clean();
|
||||
set_error_handler('simpleTestErrorHandler');
|
||||
$this->assertPattern("/<h2>Not Found<\/h2>/", $expected);
|
||||
$this->assertPattern("/<strong>'\/test_error'<\/strong>/", $expected);
|
||||
}
|
||||
/**
|
||||
* testError method
|
||||
*
|
||||
|
|
@ -209,13 +167,11 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('error404', array('message' => 'Page not found'));
|
||||
ob_clean();
|
||||
|
||||
ob_start();
|
||||
$TestErrorHandler->error(array(
|
||||
'code' => 404,
|
||||
'message' => 'Page not Found',
|
||||
'name' => "Couldn't find what you were looking for"
|
||||
));
|
||||
'name' => "Couldn't find what you were looking for"));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern("/<h2>Couldn't find what you were looking for<\/h2>/", $result);
|
||||
$this->assertPattern('/Page not Found/', $result);
|
||||
|
|
@ -228,7 +184,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testError404() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('error404', array('message' => 'Page not found'));
|
||||
$TestErrorHandler = new TestErrorHandler('error404', array('message' => 'Page not found', 'url' => '/test_error'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Not Found<\/h2>/', $result);
|
||||
$this->assertPattern("/<strong>'\/test_error'<\/strong>/", $result);
|
||||
|
|
@ -241,13 +197,11 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testMissingController() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingController', array(
|
||||
'className' => 'PostsController'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingController', array('className' => 'PostsController'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Missing Controller<\/h2>/', $result);
|
||||
$this->assertPattern('/<em>PostsController<\/em>/', $result);
|
||||
$this->assertPattern('/OrangeComponent/', $result);
|
||||
$this->assertPattern('/BlueberryComponent/', $result);
|
||||
|
||||
}
|
||||
/**
|
||||
|
|
@ -258,10 +212,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testMissingAction() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingAction', array(
|
||||
'className' => 'PostsController',
|
||||
'action' => 'index'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingAction', array('className' => 'PostsController', 'action' => 'index'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Missing Method in PostsController<\/h2>/', $result);
|
||||
$this->assertPattern('/<em>PostsController::<\/em><em>index\(\)<\/em>/', $result);
|
||||
|
|
@ -274,10 +225,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testPrivateAction() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('privateAction', array(
|
||||
'className' => 'PostsController',
|
||||
'action' => '_secretSauce'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('privateAction', array('className' => 'PostsController', 'action' => '_secretSauce'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Private Method in PostsController<\/h2>/', $result);
|
||||
$this->assertPattern('/<em>PostsController::<\/em><em>_secretSauce\(\)<\/em>/', $result);
|
||||
|
|
@ -290,10 +238,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testMissingTable() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingTable', array(
|
||||
'className' => 'Article',
|
||||
'table' => 'articles'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingTable', array('className' => 'Article', 'table' => 'articles'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Missing Database Table<\/h2>/', $result);
|
||||
$this->assertPattern('/table <em>articles<\/em> for model <em>Article<\/em>/', $result);
|
||||
|
|
@ -320,17 +265,11 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
function testMissingView() {
|
||||
restore_error_handler();
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingView', array(
|
||||
'className' => 'Pages',
|
||||
'action' => 'display',
|
||||
'file' => 'pages/about.ctp',
|
||||
'base' => ''
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingView', array('className' => 'Pages', 'action' => 'display', 'file' => 'pages/about.ctp', 'base' => ''));
|
||||
$expected = ob_get_clean();
|
||||
set_error_handler('simpleTestErrorHandler');
|
||||
$this->assertPattern("/PagesController::/", $expected);
|
||||
$this->assertPattern("/pages\/about.ctp/", $expected);
|
||||
|
||||
}
|
||||
/**
|
||||
* testMissingLayout method
|
||||
|
|
@ -341,16 +280,11 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
function testMissingLayout() {
|
||||
restore_error_handler();
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingLayout', array(
|
||||
'layout' => 'my_layout',
|
||||
'file' => 'layouts/my_layout.ctp',
|
||||
'base' => ''
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingLayout', array( 'layout' => 'my_layout', 'file' => 'layouts/my_layout.ctp', 'base' => ''));
|
||||
$expected = ob_get_clean();
|
||||
set_error_handler('simpleTestErrorHandler');
|
||||
$this->assertPattern("/Missing Layout/", $expected);
|
||||
$this->assertPattern("/layouts\/my_layout.ctp/", $expected);
|
||||
|
||||
}
|
||||
/**
|
||||
* testMissingConnection method
|
||||
|
|
@ -360,9 +294,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testMissingConnection() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingConnection', array(
|
||||
'className' => 'Article'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingConnection', array('className' => 'Article'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Missing Database Connection<\/h2>/', $result);
|
||||
$this->assertPattern('/Article requires a database connection/', $result);
|
||||
|
|
@ -375,10 +307,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testMissingHelperFile() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingHelperFile', array(
|
||||
'helper' => 'MyCustom',
|
||||
'file' => 'my_custom.php'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingHelperFile', array('helper' => 'MyCustom', 'file' => 'my_custom.php'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Missing Helper File<\/h2>/', $result);
|
||||
$this->assertPattern('/Create the class below in file:/', $result);
|
||||
|
|
@ -392,10 +321,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testMissingHelperClass() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingHelperClass', array(
|
||||
'helper' => 'MyCustom',
|
||||
'file' => 'my_custom.php'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingHelperClass', array('helper' => 'MyCustom', 'file' => 'my_custom.php'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Missing Helper Class<\/h2>/', $result);
|
||||
$this->assertPattern('/The helper class <em>MyCustomHelper<\/em> can not be found or does not exist./', $result);
|
||||
|
|
@ -409,11 +335,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testMissingComponentFile() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingComponentFile', array(
|
||||
'className' => 'PostsController',
|
||||
'component' => 'Sidebox',
|
||||
'file' => 'sidebox.php'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingComponentFile', array('className' => 'PostsController', 'component' => 'Sidebox', 'file' => 'sidebox.php'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Missing Component File<\/h2>/', $result);
|
||||
$this->assertPattern('/Create the class <em>SideboxComponent<\/em> in file:/', $result);
|
||||
|
|
@ -427,11 +349,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testMissingComponentClass() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingComponentClass', array(
|
||||
'className' => 'PostsController',
|
||||
'component' => 'Sidebox',
|
||||
'file' => 'sidebox.php'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingComponentClass', array('className' => 'PostsController', 'component' => 'Sidebox', 'file' => 'sidebox.php'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Missing Component Class<\/h2>/', $result);
|
||||
$this->assertPattern('/Create the class <em>SideboxComponent<\/em> in file:/', $result);
|
||||
|
|
@ -445,10 +363,7 @@ class TestErrorHandlerTest extends CakeTestCase {
|
|||
*/
|
||||
function testMissingModel() {
|
||||
ob_start();
|
||||
$TestErrorHandler = new TestErrorHandler('missingModel', array(
|
||||
'className' => 'Article',
|
||||
'file' => 'article.php'
|
||||
));
|
||||
$TestErrorHandler = new TestErrorHandler('missingModel', array('className' => 'Article', 'file' => 'article.php'));
|
||||
$result = ob_get_clean();
|
||||
$this->assertPattern('/<h2>Missing Model<\/h2>/', $result);
|
||||
$this->assertPattern('/<em>Article<\/em> could not be found./', $result);
|
||||
|
|
|
|||
Loading…
Reference in a new issue