Skip to content
Permalink
Browse files

Fixing constant declaration as it was not consistent in web runner an…

…d cli runner
  • Loading branch information...
lorenzo committed Jul 8, 2010
1 parent fa8db57 commit 7b51feb89c19b2271ddbf54156e8cd7f29ba2bab
Showing with 8 additions and 2 deletions.
  1. +7 −1 cake/console/cake.php
  2. +1 −1 cake/tests/cases/console/libs/api.test.php
@@ -155,9 +155,15 @@ function __initConstants() {
if (!defined('CAKE_CORE_INCLUDE_PATH')) {
define('DS', DIRECTORY_SEPARATOR);
define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(dirname(__FILE__))));
define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
define('DISABLE_DEFAULT_ERROR_HANDLING', false);
define('CAKEPHP_SHELL', true);
if (!defined('CORE_PATH')) {
if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
define('CORE_PATH', null);
} else {
define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
}
}
}
require_once(CORE_PATH . 'cake' . DS . 'basics.php');
}
@@ -103,7 +103,7 @@ public function testMethodNameDetection () {
$this->Shell->expects($this->at(2))->method('out')->with($expected);
$this->Shell->args = array('controller');
$this->Shell->paths['controller'] = LIBS . 'controller' . DS;
$this->Shell->paths['controller'] = CAKE_CORE_INCLUDE_PATH . DS . LIBS . 'controller' . DS;
$this->Shell->main();
}
}

0 comments on commit 7b51feb

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