Updating FixtureTask and FixtureTask test to use TemplateTask

cakephp · May 13, 2009 · a38233e · a38233e
1 parent dff90e8
commit a38233e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cake/console/libs/tasks/fixture.php b/cake/console/libs/tasks/fixture.php
@@ -42,7 +42,7 @@ class FixtureTask extends Shell {
  * @var array
  * @access public
  */
-	var $tasks = array('DbConfig', 'Model');
+	var $tasks = array('DbConfig', 'Model', 'Template');
 /**
  * path to fixtures directory
  *
@@ -219,11 +219,9 @@ function generateFixtureFile($model, $otherVars) {
 		}
 		$filename = Inflector::underscore($model) . '_fixture.php';
 
-		$Generator = new CodeGenerator();
-		$Generator->setPaths($this->Dispatch->shellPaths);
-		$Generator->set('model', $model);
-		$Generator->set($vars);
-		$content = $Generator->generate('objects', 'fixture');
+		$this->Template->set('model', $model);
+		$this->Template->set($vars);
+		$content = $this->Template->generate('objects', 'fixture');
 
 		$this->out("\nBaking test fixture for $model...");
 		$this->createFile($path . $filename, $content);

diff --git a/cake/tests/cases/console/libs/tasks/fixture.test.php b/cake/tests/cases/console/libs/tasks/fixture.test.php
@@ -38,7 +38,7 @@
 }
 
 if (!class_exists('FixtureTask')) {
-	require CAKE . 'console' .  DS . 'libs' . DS . 'bake.php';
+	require CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
 	require CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'fixture.php';
 }
 
@@ -80,7 +80,9 @@ function startTest() {
 		$this->Task =& new MockFixtureTask();
 		$this->Task->Model =& new MockFixtureModelTask();
 		$this->Task->Dispatch = new $this->Dispatcher;
+		$this->Task->Template =& new TemplateTask($this->Task->Dispatch);
 		$this->Task->Dispatch->shellPaths = Configure::read('shellPaths');
+		$this->Task->Template->initialize();
 	}
 /**
  * tearDown method