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

Merge branch '1.3-console' of dev@code.cakephp.org:cakephp into 1.3-console

Browse source
This commit is contained in:
gwoo 2009-07-30 11:35:49 -07:00
commit 1e88afdc5a
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cake/console/libs/testsuite.php
View file

@ -94,7 +94,7 @@ class TestSuiteShell extends Shell {
if (isset($corePath[0])) {
define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
} else {
define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS);
}
$this->__installSimpleTest();
@ -236,8 +236,13 @@ class TestSuiteShell extends Shell {
return true;
}
if ($this->category == 'core' && file_exists($folder.DS.'cases'.DS.'libs'.DS.$this->file.'.test.php')) {
return true;
if ($this->category == 'core') {
if (file_exists($folder.DS.'cases'.DS.$this->file.'.test.php')) {
return true;
}
if (file_exists($folder.DS.'cases'.DS.'libs'.DS.$this->file.'.test.php')) {
return true;
}
}
if ($isPlugin && file_exists($folder.DS.'cases'.DS.$this->file.'.test.php')) {
@ -292,7 +297,11 @@ class TestSuiteShell extends Shell {
return $result;
}
$case = 'libs'.DS.$this->file.'.test.php';
if (file_exists(CORE_TEST_CASES . DS . $this->file . '.test.php')) {
$case = $this->file . '.test.php';
} else {
$case = 'libs' . DS . $this->file . '.test.php';
}
if ($this->category == 'app') {
$case = $this->file.'.test.php';
} elseif ($this->isPluginTest) {