Merge branch '1.3-dev' into 1.3

cakephp · Aug 3, 2009 · d15a961 · d15a961
2 parents 400e1b2 + 33370fd
commit d15a961
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cake/tests/cases/libs/code_coverage_manager.test.php b/cake/tests/cases/libs/code_coverage_manager.test.php
@@ -78,7 +78,7 @@ function testNoTestCaseSupplied() {
 			CodeCoverageManager::report(false);
 			$this->assertError();
 
-			CodeCoverageManager::start('libs/'.basename(__FILE__), new CakeHtmlReporter());
+			CodeCoverageManager::start('tests' . DS . 'lib' . DS . basename(__FILE__), new CakeHtmlReporter());
 			CodeCoverageManager::report(false);
 			$this->assertError();
 

diff --git a/cake/tests/groups/no_database.group.php b/cake/tests/groups/no_database.group.php
@@ -55,7 +55,7 @@ function NoDatabaseGroupTest() {
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'router');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'inflector');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'validation');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'session');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_session');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_socket');
 		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view');
 	}