Fixing the path used to create fixtures.

cakephp · May 30, 2011 · d0af5c7 · d0af5c7
1 parent f55fa4d
commit d0af5c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/Cake/Console/Command/Task/FixtureTask.php b/lib/Cake/Console/Command/Task/FixtureTask.php
@@ -57,7 +57,7 @@ class FixtureTask extends BakeTask {
  */
 	public function __construct($stdout = null, $stderr = null, $stdin = null) {
 		parent::__construct($stdout, $stderr, $stdin);
-		$this->path = APP . 'tests' . DS . 'Fixture' . DS;
+		$this->path = APP . 'Test' . DS . 'Fixture' . DS;
 	}
 
 /**
@@ -267,7 +267,7 @@ public function generateFixtureFile($model, $otherVars) {
 	public function getPath() {
 		$path = $this->path;
 		if (isset($this->plugin)) {
-			$path = $this->_pluginPath($this->plugin) . 'tests' . DS . 'Fixture' . DS;
+			$path = $this->_pluginPath($this->plugin) . 'Test' . DS . 'Fixture' . DS;
 		}
 		return $path;
 	}

diff --git a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
@@ -83,7 +83,7 @@ public function testConstruct() {
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
 
 		$Task = new FixtureTask($out, $out, $in);
-		$this->assertEqual($Task->path, APP . 'tests' . DS . 'Fixture' . DS);
+		$this->assertEqual($Task->path, APP . 'Test' . DS . 'Fixture' . DS);
 	}
 
 /**
@@ -362,7 +362,7 @@ public function testGeneratePluginFixtureFile() {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
 		$this->Task->plugin = 'TestFixture';
-		$filename = APP . 'Plugin' . DS . 'TestFixture' . DS . 'tests' . DS . 'Fixture' . DS . 'ArticleFixture.php';
+		$filename = APP . 'Plugin' . DS . 'TestFixture' . DS . 'Test' . DS . 'Fixture' . DS . 'ArticleFixture.php';
 
 		//fake plugin path
 		CakePlugin::load('TestFixture', array('path' =>  APP . 'Plugin' . DS . 'TestFixture' . DS));