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

Fixing recently broken tests

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-05-19 21:35:51 -04:30
parent 38ad1bfc62
commit 85c505fd4f
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
View file

@ -88,11 +88,11 @@ class PluginTaskTest extends CakeTestCase {
'Controller' . DS . 'Component', 'Controller' . DS . 'Component',
'Lib', 'Lib',
'View' . DS . 'Helper', 'View' . DS . 'Helper',
'tests' . DS . 'Case' . DS . 'Controller' . DS . 'Component', 'Test' . DS . 'Case' . DS . 'Controller' . DS . 'Component',
'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper', 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper',
'tests' . DS . 'Case' . DS . 'Model' . DS . 'Behavior', 'Test' . DS . 'Case' . DS . 'Model' . DS . 'Behavior',
'tests' . DS . 'Fixture', 'Test' . DS . 'Fixture',
'vendors', 'Vendor',
'webroot' 'webroot'
); );
foreach ($directories as $dir) { foreach ($directories as $dir) {

8
lib/Cake/TestSuite/CakeTestLoader.php
View file

@ -56,10 +56,12 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
$result = APP_TEST_CASES; $result = APP_TEST_CASES;
} else if (!empty($params['plugin'])) { } else if (!empty($params['plugin'])) {
if (!CakePlugin::loaded($params['plugin'])) { if (!CakePlugin::loaded($params['plugin'])) {
CakePlugin::load($params['plugin']); try {
CakePlugin::load($params['plugin']);
$pluginPath = CakePlugin::path($params['plugin']);
$result = $pluginPath . 'Test' . DS . 'Case';
} catch (MissingPluginException $e) {}
} }
$pluginPath = CakePlugin::path($params['plugin']);
$result = $pluginPath . 'Test' . DS . 'Case';
} }
return $result; return $result;
} }