diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php index 718eff603..431073986 100644 --- a/cake/console/libs/tasks/test.php +++ b/cake/console/libs/tasks/test.php @@ -159,7 +159,7 @@ class TestTask extends Shell { if (strpos($this->path, $type) === false) { $this->filePath = $this->path . 'cases' . DS . Inflector::tableize($type) . DS; } - $made = $this->createFile($this->filePath . Inflector::underscore($className) . '.test.php', $out); + $made = $this->createFile($this->filePath . Inflector::underscore($fullClassName) . '.test.php', $out); if ($made) { return $out; } diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php index 735cb7082..d2f122a94 100644 --- a/cake/tests/cases/console/libs/tasks/test.test.php +++ b/cake/tests/cases/console/libs/tasks/test.test.php @@ -161,13 +161,16 @@ class TestTaskTest extends CakeTestCase { $this->Task->Dispatch->expectNever('stderr'); $this->Task->Dispatch->expectNever('_stop'); - $this->Task->setReturnValueAt(0, 'in', 'y'); + $this->Task->setReturnValue('in', 'y'); $this->Task->expectAt(0, 'createFile', array($file, '*')); $this->Task->bake('Model', 'MyClass'); - $this->Task->setReturnValueAt(1, 'in', 'y'); $this->Task->expectAt(1, 'createFile', array($file, '*')); $this->Task->bake('Model', 'MyClass'); + + $file = TESTS . 'cases' . DS . 'controllers' . DS . 'comments_controller.test.php'; + $this->Task->expectAt(2, 'createFile', array($file, '*')); + $this->Task->bake('Controller', 'Comments'); } /**