From c9ca3c3785d40d39ee5274e004d766a91d48602a Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 2 Nov 2010 23:25:36 -0400
Subject: [PATCH] Fixing path constants in DbConfig and FixtureTask to be more
 consistent between web and cli.

---
 cake/console/shells/tasks/db_config.php                  | 2 +-
 cake/console/shells/tasks/fixture.php                    | 2 +-
 cake/tests/cases/console/shells/tasks/db_config.test.php | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cake/console/shells/tasks/db_config.php b/cake/console/shells/tasks/db_config.php
index d640dd796..d7e5a20c0 100644
--- a/cake/console/shells/tasks/db_config.php
+++ b/cake/console/shells/tasks/db_config.php
@@ -66,7 +66,7 @@ class DbConfigTask extends Shell {
  * @var string
  */
 	public function initialize() {
-		$this->path = APP_PATH . 'config' . DS;
+		$this->path = APP . 'config' . DS;
 	}
 
 /**
diff --git a/cake/console/shells/tasks/fixture.php b/cake/console/shells/tasks/fixture.php
index 5eccca367..e31b85674 100644
--- a/cake/console/shells/tasks/fixture.php
+++ b/cake/console/shells/tasks/fixture.php
@@ -56,7 +56,7 @@ class FixtureTask extends BakeTask {
  */
 	public function __construct($stdout = null, $stderr = null, $stdin = null) {
 		parent::__construct($stdout, $stderr, $stdin);
-		$this->path = APP_PATH . 'tests' . DS . 'fixtures' . DS;
+		$this->path = APP . 'tests' . DS . 'fixtures' . DS;
 	}
 
 /**
diff --git a/cake/tests/cases/console/shells/tasks/db_config.test.php b/cake/tests/cases/console/shells/tasks/db_config.test.php
index 5429e9723..7a23e2ac8 100644
--- a/cake/tests/cases/console/shells/tasks/db_config.test.php
+++ b/cake/tests/cases/console/shells/tasks/db_config.test.php
@@ -90,7 +90,7 @@ class DbConfigTaskTest extends CakeTestCase {
 	public function testGetConfig() {
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('otherOne'));
 		$result = $this->Task->getConfig();
-		$this->assertEqual($result, 'otherOne');
+		$this->assertEquals('otherOne', $result);
 	}
 
 /**
@@ -101,8 +101,7 @@ class DbConfigTaskTest extends CakeTestCase {
 	public function testInitialize() {
 		$this->Task->initialize();
 		$this->assertFalse(empty($this->Task->path));
-		$this->assertEqual($this->Task->path, APP . 'config' . DS);
-
+		$this->assertEquals(APP . 'config' . DS, $this->Task->path);
 	}
 
 /**