From 9f189d39dbf3e9f02b4217ff66b33573cbfe0ce2 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Tue, 8 Mar 2011 14:43:00 -0430
Subject: [PATCH] Fixing the HelpFormatter test

---
 lib/Cake/Console/Command/TestsuiteShell.php               | 2 +-
 lib/Cake/Console/ConsoleOptionParser.php                  | 2 ++
 lib/Cake/tests/cases/console/libs/help_formatter.test.php | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Cake/Console/Command/TestsuiteShell.php b/lib/Cake/Console/Command/TestsuiteShell.php
index d235dad63..d788cae3d 100644
--- a/lib/Cake/Console/Command/TestsuiteShell.php
+++ b/lib/Cake/Console/Command/TestsuiteShell.php
@@ -137,7 +137,7 @@ class TestsuiteShell extends Shell {
 		))->addOption('bootstrap', array(
 			'help' => __('<file> A "bootstrap" PHP file that is run before the tests.'),
 			'default' => false
-		))->addOption('configuraion', array(
+		))->addOption('configuration', array(
 			'help' => __('<file> Read configuration from XML file.'),
 			'default' => false
 		))->addOption('no-configuration', array(
diff --git a/lib/Cake/Console/ConsoleOptionParser.php b/lib/Cake/Console/ConsoleOptionParser.php
index 82e49d1d0..b84615ea5 100644
--- a/lib/Cake/Console/ConsoleOptionParser.php
+++ b/lib/Cake/Console/ConsoleOptionParser.php
@@ -16,9 +16,11 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 App::uses('TaskCollection', 'Console');
 App::uses('ConsoleOutput', 'Console');
 App::uses('ConsoleInput', 'Console');
+App::uses('ConsoleInputSubcommand', 'Console');
 App::uses('ConsoleInputOption', 'Console');
 App::uses('ConsoleInputArgument', 'Console');
 App::uses('ConsoleOptionParser', 'Console');
diff --git a/lib/Cake/tests/cases/console/libs/help_formatter.test.php b/lib/Cake/tests/cases/console/libs/help_formatter.test.php
index 5caae1490..f296a84ea 100644
--- a/lib/Cake/tests/cases/console/libs/help_formatter.test.php
+++ b/lib/Cake/tests/cases/console/libs/help_formatter.test.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once CONSOLE_LIBS . 'console_option_parser.php';
-require_once CONSOLE_LIBS . 'help_formatter.php';
+App::uses('ConsoleOptionParser', 'Console');
+App::uses('HelpFormatter', 'Console');
 
 class HelpFormatterTest extends CakeTestCase {