Skip to content
Permalink
Browse files

Fix failing tests caused by directory changes.

A few tests relied on the lib/ directory, update them.
  • Loading branch information...
markstory committed Sep 13, 2013
1 parent 57ecda8 commit fa0b32323729158323e72b5e96aa0f9955966e86
Showing with 4 additions and 6 deletions.
  1. +0 −2 Cake/Test/TestCase/Utility/DebuggerTest.php
  2. +2 −2 Cake/Test/TestCase/Utility/FolderTest.php
  3. +2 −2 Cake/Test/init.php
@@ -292,8 +292,6 @@ public function customFormat($error, $strings) {
*/
public function testTrimPath() {
$this->assertEquals('APP/', Debugger::trimPath(APP));
$this->assertEquals('CORE', Debugger::trimPath(CAKE_CORE_INCLUDE_PATH));
$this->assertEquals('ROOT', Debugger::trimPath(ROOT));
$this->assertEquals('CORE' . DS . 'Cake' . DS, Debugger::trimPath(CAKE));
$this->assertEquals('Some/Other/Path', Debugger::trimPath('Some/Other/Path'));
}
@@ -578,8 +578,8 @@ public function testInCakePath() {
$result = $Folder->inCakePath($path);
$this->assertFalse($result);
$path = DS . 'lib' . DS . 'Cake' . DS . 'Config';
$Folder->cd(ROOT . DS . 'lib' . DS . 'Cake' . DS . 'Config');
$path = DS . 'Cake' . DS . 'Config';
$Folder->cd(ROOT . DS . 'Cake' . DS . 'Config');
$result = $Folder->inCakePath($path);
$this->assertTrue($result);
}
@@ -32,11 +32,11 @@
define('LOG_ERROR', LOG_ERR);
// Point app constants to the test app.
define('APP', ROOT . '/lib/Cake/Test/TestApp/');
define('APP', ROOT . '/Cake/Test/TestApp/');
define('WWW_ROOT', APP . WEBROOT_DIR . DS);
define('TESTS', APP . 'Test' . DS);
define('TEST_APP', ROOT . '/lib/Cake/Test/TestApp/');
define('TEST_APP', ROOT . '/Cake/Test/TestApp/');
//@codingStandardsIgnoreStart
@mkdir(LOGS);

0 comments on commit fa0b323

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