diff --git a/app/webroot/test.php b/app/webroot/test.php index a2e534a09..1cb8faa20 100644 --- a/app/webroot/test.php +++ b/app/webroot/test.php @@ -66,9 +66,6 @@ require_once CAKE . 'tests' . DS . 'lib' . DS . 'test_manager.php'; if(DEBUG < 1) { die('Invalid url.'); } -if(!vendor('simpletest' . DS . 'reporter')) { - die('SimpleTest is not installed.'); -} if (!isset($_SERVER['SERVER_NAME'])) { $_SERVER['SERVER_NAME'] = ''; @@ -94,6 +91,13 @@ if(isset($_GET['output']) && $_GET['output'] == 'html') { define('CAKE_TEST_OUTPUT', CAKE_TEST_OUTPUT_TEXT); } +if(!vendor('simpletest' . DS . 'reporter')) { + CakePHPTestHeader(); + include CAKE . 'tests' . DS . 'lib' . DS . 'simpletest.php'; + CakePHPTestSuiteFooter(); + exit(); +} + function &CakeTestsGetReporter() { static $Reporter = NULL; if (!$Reporter) { @@ -162,6 +166,7 @@ if(isset($_GET['output']) && $_GET['output'] == 'html') { switch (CAKE_TEST_OUTPUT) { case CAKE_TEST_OUTPUT_HTML: $baseUrl = BASE_URL; + $characterSet = 'ISO-8859-1'; include CAKE . 'tests' . DS . 'lib' . DS . 'header.php'; break; case CAKE_TEST_OUTPUT_TEXT: @@ -189,10 +194,10 @@ if(isset($_GET['output']) && $_GET['output'] == 'html') { break; } } - + CakePHPTestHeader(); CakePHPTestSuiteHeader(); - + if (isset($_GET['group'])) { if ('all' == $_GET['group']) { TestManager::runAllTests(CakeTestsGetReporter()); diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php index 84e4da8ea..6b08ddd04 100644 --- a/cake/tests/cases/libs/model/model.test.php +++ b/cake/tests/cases/libs/model/model.test.php @@ -31,7 +31,10 @@ } require_once LIBS.'model'.DS.'model.php'; - class Test extends Model { var $useTable = false; } + class Test extends Model { + var $useTable = false; + var $name = 'Test'; + } /** * Short description for class. * diff --git a/cake/tests/lib/content.php b/cake/tests/lib/content.php index b53378e67..11c939936 100644 --- a/cake/tests/lib/content.php +++ b/cake/tests/lib/content.php @@ -28,7 +28,6 @@ */ ?>
-

CakePHP Test Suite v 1.2.0.0

- - \ No newline at end of file + diff --git a/cake/tests/lib/header.php b/cake/tests/lib/header.php index 7e4c859d5..6163cf7f0 100644 --- a/cake/tests/lib/header.php +++ b/cake/tests/lib/header.php @@ -30,7 +30,7 @@ - + CakePHP Test Suite v 1.2.0.0