Updating CakeTestCase::testAction() to respect $dropTables. Test case…

… added Fixes #6123

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8051 3807eeeb-6ff5-0310-8944-8be069107fe0

cake/tests/cases/libs/cake_test_case.test.php

@@ -265,6 +265,7 @@ function testTestAction() {
 		));
 		$this->assertEqual($result['params']['pass'], array('gogo', 'val2'));
 
+
 		$result = $this->Case->testAction('/tests_apps_posts/url_var', array(
 			'return' => 'vars',
 			'method' => 'get',
@@ -288,8 +289,8 @@ function testTestAction() {
 		));
 		$this->assertEqual(array_keys($result['data']), array('name', 'pork'));
 
-		$db =& ConnectionManager::getDataSource('test_suite');
 
+		$db =& ConnectionManager::getDataSource('test_suite');
 		$_backPrefix = $db->config['prefix'];
 		$db->config['prefix'] = 'cake_testaction_test_suite_';
 
@@ -298,24 +299,58 @@ function testTestAction() {
 
 		ConnectionManager::create('cake_test_case', $config);
 		$db =& ConnectionManager::getDataSource('cake_test_case');
+
 		$fixture =& new PostFixture($db);
 		$fixture->create($db);
 		$fixture->insert($db);
-
+		
 		$result = $this->Case->testAction('/tests_apps_posts/fixtured', array(
 			'return' => 'vars',
 			'fixturize' => true,
 			'connection' => 'cake_test_case',
 		));
 		$this->assertTrue(isset($result['posts']));
 		$this->assertEqual(count($result['posts']), 3);
+		$tables = $db->listSources(true);
+		$this->assertFalse(in_array('cake_testaction_test_suite_posts', $tables));
 
 		$fixture->drop($db);
 
 		$db =& ConnectionManager::getDataSource('test_suite');
 		$db->config['prefix'] = $_backPrefix;
 		$fixture->drop($db);
 
+
+		//test that drop tables behaves as exepected with testAction
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$_backPrefix = $db->config['prefix'];
+		$db->config['prefix'] = 'cake_testaction_test_suite_';
+
+		$config = $db->config;
+		$config['prefix'] = 'cake_testcase_test_';
+
+		ConnectionManager::create('cake_test_case', $config);
+		$db =& ConnectionManager::getDataSource('cake_test_case');
+		$fixture =& new PostFixture($db);
+		$fixture->create($db);
+		$fixture->insert($db);
+
+		$this->Case->dropTables = false;
+		$result = $this->Case->testAction('/tests_apps_posts/fixtured', array(
+			'return' => 'vars',
+			'fixturize' => true,
+			'connection' => 'cake_test_case',
+		));
+
+		$tables = $db->listSources();
+		$this->assertTrue(in_array('cake_testaction_test_suite_posts', $tables));
+
+		$fixture->drop($db);
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$db->config['prefix'] = $_backPrefix;
+		$fixture->drop($db);
+
+
 		Configure::write('modelPaths', $_back['model']);
 		Configure::write('controllerPaths', $_back['controller']);
 		Configure::write('viewPaths', $_back['view']);

cake/tests/lib/cake_test_case.php

@@ -223,7 +223,7 @@ function startController(&$controller, $params = array()) {
  * * @param array $params	Additional parameters as sent by testAction().
  */
 	function endController(&$controller, $params = array()) {
-		if (isset($this->db) && isset($this->_actionFixtures) && !empty($this->_actionFixtures)) {
+		if (isset($this->db) && isset($this->_actionFixtures) && !empty($this->_actionFixtures) && $this->dropTables) {
 			foreach ($this->_actionFixtures as $fixture) {
 				$fixture->drop($this->db);
 			}