Skip to content
Permalink
Browse files

Merge pull request #3838 from cakephp/revert-3646-no-truncate-fixture

Revert "No truncate when drop table."

Not truncating tables when they are created causes a number of 
issues in ControllerTestCases as indicated by the comments in #3646 post merge.
  • Loading branch information...
markstory committed Jul 2, 2014
2 parents 2577ca9 + 1686edf commit 2c53bc8a1b9a8c56fe2f1e5095029c50588fa6e0
Showing with 2 additions and 6 deletions.
  1. +2 −6 lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
@@ -229,9 +229,7 @@ public function load(CakeTestCase $test) {
$db = ConnectionManager::getDataSource($fixture->useDbConfig);
$db->begin();
$this->_setupTable($fixture, $db, $test->dropTables);
if (!$test->dropTables) {
$fixture->truncate($db);
}
$fixture->truncate($db);
$fixture->insert($db);
$db->commit();
}
@@ -276,9 +274,7 @@ public function loadSingle($name, $db = null, $dropTables = true) {
$db = ConnectionManager::getDataSource($fixture->useDbConfig);
}
$this->_setupTable($fixture, $db, $dropTables);
if (!$dropTables) {
$fixture->truncate($db);
}
$fixture->truncate($db);
$fixture->insert($db);
} else {
throw new UnexpectedValueException(__d('cake_dev', 'Referenced fixture class %s not found', $name));

0 comments on commit 2c53bc8

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