Making constructClasses() call run against the correct object. test c…

…ases updated. Fixes #4
cakephp · Aug 12, 2009 · 31d136c · 31d136c
1 parent b731408
commit 31d136c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php
@@ -391,7 +391,8 @@ function generateConstructor($type, $fullClassName) {
 			return "ClassRegistry::init('$fullClassName');\n";
 		}
 		if ($type == 'controller') {
-			return "new Test$fullClassName();\n\t\t\$this->{$fullClassName}->constructClasses();\n";
+			$className = substr($fullClassName, 0, strlen($fullClassName) - 10);
+			return "new Test$fullClassName();\n\t\t\$this->{$className}->constructClasses();\n";
 		}
 		return "new $fullClassName()\n";
 	}

diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php
@@ -362,7 +362,8 @@ function testBakeControllerTest() {
 		$this->assertPattern('/function redirect\(\$url, \$status = null, \$exit = true\)/', $result);
 
 		$this->assertPattern('/function startTest\(\)/', $result);
-		$this->assertPattern("/\\\$this->TestTaskComments \=\& new TestTestTaskCommentsController()/", $result);
+		$this->assertPattern("/\\\$this->TestTaskComments \=\& new TestTestTaskCommentsController\(\)/", $result);
+		$this->assertPattern("/\\\$this->TestTaskComments->constructClasses\(\)/", $result);
 
 		$this->assertPattern('/function endTest\(\)/', $result);
 		$this->assertPattern('/unset\(\$this->TestTaskComments\)/', $result);
@@ -382,7 +383,7 @@ function testBakeControllerTest() {
  **/
 	function testGenerateContsructor() {
 		$result = $this->Task->generateConstructor('controller', 'PostsController');
-		$expected = "new TestPostsController();\n\t\t\$this->PostsController->constructClasses();\n";
+		$expected = "new TestPostsController();\n\t\t\$this->Posts->constructClasses();\n";
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Task->generateConstructor('model', 'Post');