Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix broken tests for TestTask class

  • Loading branch information...
commit 287c7b432a7c2b94cf99dd133fbc1d85f469e7d9 1 parent c651bf2
@huoxito huoxito authored
View
4 lib/Cake/Console/Templates/default/classes/test.ctp
@@ -28,9 +28,9 @@ App::uses('<?php echo $dependency[0]; ?>', '<?php echo $dependency[1]; ?>');
*
*/
<?php if ($type === 'Controller'): ?>
-class <?php echo $fullClassName; ?>TestCase extends ControllerTestCase {
+class <?php echo $fullClassName; ?>Test extends ControllerTestCase {
<?php else: ?>
-class <?php echo $fullClassName; ?>TestCase extends CakeTestCase {
+class <?php echo $fullClassName; ?>Test extends CakeTestCase {
<?php endif; ?>
<?php if (!empty($fixtures)): ?>
View
14 lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
@@ -455,9 +455,7 @@ public function testBakeModelTest() {
}
/**
- * 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 @@ public function testBakeControllerTest() {
$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 @@ public function testBakeHelperTest() {
*/
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);

0 comments on commit 287c7b4

Please sign in to comment.
Something went wrong with that request. Please try again.