Fixed Shell naming from using Inflector::underscore() to Inflector::c…

…amelize(). Added small test case for Shell naming. Fixed missing CakePlugin::load() call in ShellTest.
cakephp · May 29, 2011 · a80d82e · a80d82e
1 parent 85c505f
commit a80d82e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php
@@ -467,7 +467,7 @@ public function getOptionParser() {
 	public function getPath() {
 		$path = $this->path;
 		if (isset($this->plugin)) {
-			$path = $this->_pluginPath($this->plugin) . 'tests' . DS;
+			$path = $this->_pluginPath($this->plugin) . 'Test' . DS;
 		}
 		return $path;
 	}

diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
@@ -149,7 +149,7 @@ class Shell extends Object {
  */
 	function __construct($stdout = null, $stderr = null, $stdin = null) {
 		if ($this->name == null) {
-			$this->name = Inflector::underscore(str_replace(array('Shell', 'Task'), '', get_class($this)));
+			$this->name = Inflector::camelize(str_replace(array('Shell', 'Task'), '', get_class($this)));
 		}
 		$this->Tasks = new TaskCollection($this);
 

diff --git a/lib/Cake/Test/Case/Console/Command/ShellTest.php b/lib/Cake/Test/Case/Console/Command/ShellTest.php
@@ -172,6 +172,7 @@ public function testInitialize() {
 			'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'models' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
 		), true);
+		CakePlugin::load('TestPlugin');
 
 		$this->Shell->uses = array('TestPlugin.TestPluginPost');
 		$this->Shell->initialize();
@@ -799,4 +800,17 @@ function testWrapText() {
 TEXT;
 		$this->assertEquals($expected, $result, 'Text not wrapped.');
 	}
+
+/**
+ * Testing camel cased naming of tasks
+ * 
+ * @access public
+ * @return void
+ */
+	public function testShellNaming() {
+		$this->Shell->tasks = array('TestApple');
+		$this->Shell->loadTasks();
+		$expected = 'TestApple';
+		$this->assertEqual($expected, $this->Shell->TestApple->name);
+	}
 }