From d0af5c78d5be007bbd03720f22fe1f25f23548cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Renan=20Gon=C3=A7alves?= Date: Mon, 30 May 2011 21:04:38 +0200 Subject: [PATCH] Fixing the path used to create fixtures. --- lib/Cake/Console/Command/Task/FixtureTask.php | 4 ++-- lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Cake/Console/Command/Task/FixtureTask.php b/lib/Cake/Console/Command/Task/FixtureTask.php index d7359bbccd2..d69f95d6928 100644 --- 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 index 7baf6bc8849..27b726b9cc7 100644 --- 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));