Merge pull request #645 from huoxito/2.2

Make controller test template extends ControllerTestCase instead of CakeTestCase

lib/Cake/Console/Command/Task/TestTask.php

@@ -460,7 +460,7 @@ class TestTask extends BakeTask {
 		}
 		if ($type == 'controller') {
 			$className = substr($fullClassName, 0, -10);
-			$construct = "new Test$fullClassName();\n";
+			$construct = "new $fullClassName();\n";
 			$post = "\$this->{$className}->constructClasses();\n";
 		}
 		if ($type == 'helper') {

lib/Cake/Console/Templates/default/classes/test.ctp

@@ -23,40 +23,15 @@ echo "<?php\n";
 App::uses('<?php echo $dependency[0]; ?>', '<?php echo $dependency[1]; ?>');
 <?php endforeach; ?>
 
-<?php if ($mock && strtolower($type) === 'controller'): ?>
-/**
- * Test<?php echo $fullClassName; ?>
- *
- */
-class Test<?php echo $fullClassName; ?> extends <?php echo $fullClassName; ?> {
-
-/**
- * Auto render
- *
- * @var boolean
- */
-	public $autoRender = false;
-
-/**
- * Redirect action
- *
- * @param mixed $url
- * @param mixed $status
- * @param boolean $exit
- * @return void
- */
-	public function redirect($url, $status = null, $exit = true) {
-		$this->redirectUrl = $url;
-	}
-
-}
-
-<?php endif; ?>
 /**
  * <?php echo $fullClassName; ?> Test Case
  *
  */
+<?php if ($type === 'Controller'): ?>
+class <?php echo $fullClassName; ?>Test extends ControllerTestCase {
+<?php else: ?>
 class <?php echo $fullClassName; ?>Test extends CakeTestCase {
+<?php endif; ?>
 
 <?php if (!empty($fixtures)): ?>
 /**

lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php

@@ -455,9 +455,7 @@ class TestTaskTest extends CakeTestCase {
 	}
 
 /**
- * test baking controller test files, ensure that the stub class is generated.
- * Conditional assertion is known to fail on PHP4 as classnames are all lower case
- * causing issues with inflection of path name from classname.
+ * test baking controller test files
  *
  * @return void
  */
@@ -468,14 +466,10 @@ class TestTaskTest extends CakeTestCase {
 		$result = $this->Task->bake('Controller', 'TestTaskComments');
 
 		$this->assertContains("App::uses('TestTaskCommentsController', 'Controller')", $result);
-		$this->assertContains('class TestTaskCommentsControllerTest extends CakeTestCase', $result);
-
-		$this->assertContains('class TestTestTaskCommentsController extends TestTaskCommentsController', $result);
-		$this->assertContains('public $autoRender = false', $result);
-		$this->assertContains('function redirect($url, $status = null, $exit = true)', $result);
+		$this->assertContains('class TestTaskCommentsControllerTest extends ControllerTestCase', $result);
 
 		$this->assertContains('function setUp()', $result);
-		$this->assertContains("\$this->TestTaskComments = new TestTestTaskCommentsController()", $result);
+		$this->assertContains("\$this->TestTaskComments = new TestTaskCommentsController()", $result);
 		$this->assertContains("\$this->TestTaskComments->constructClasses()", $result);
 
 		$this->assertContains('function tearDown()', $result);
@@ -556,7 +550,7 @@ class TestTaskTest extends CakeTestCase {
  */
 	public function testGenerateConstructor() {
 		$result = $this->Task->generateConstructor('controller', 'PostsController', null);
-		$expected = array('', "new TestPostsController();\n", "\$this->Posts->constructClasses();\n");
+		$expected = array('', "new PostsController();\n", "\$this->Posts->constructClasses();\n");
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Task->generateConstructor('model', 'Post', null);