Changes relatives to templates from last commit.

cakephp · May 31, 2011 · 6f821e0 · 6f821e0
1 parent 2134816
commit 6f821e0
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/app/Console/templates/empty → app/Console/Templates/empty b/app/Console/templates/empty → app/Console/Templates/empty
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
@@ -70,7 +70,7 @@ public function tearDown() {
  * @return void
  */
 	protected function _setupTestProject() {
-		$skel = CAKE . 'Console' . DS . 'templates' . DS . 'skel';
+		$skel = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
 		$this->Task->bake($this->Task->path . 'bake_test_app', $skel);
 	}
@@ -116,7 +116,7 @@ public function testBake() {
  */
 	public function testExecuteWithAbsolutePath() {
 		$this->Task->args[0] = TMP . 'tests' . DS . 'bake_test_app';
-		$this->Task->params['skel'] = CAKE . 'Console' . DS . 'templates' . DS . 'skel';
+		$this->Task->params['skel'] = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
 		$this->Task->execute();
 
@@ -269,7 +269,7 @@ public function testGetPrefixWithMultiplePrefixes() {
  * @return void
  */
 	public function testExecute() {
-		$this->Task->params['skel'] = CAKE . 'Console' . DS. 'templates' . DS . 'skel';
+		$this->Task->params['skel'] = CAKE . 'Console' . DS. 'Templates' . DS . 'skel';
 		$this->Task->params['working'] = TMP . 'tests' . DS;
 
 		$path = $this->Task->path . 'bake_test_app';

diff --git a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
@@ -89,7 +89,7 @@ public function testSet() {
 	public function testFindingInstalledThemesForBake() {
 		$consoleLibs = CAKE . 'Console' . DS;
 		$this->Task->initialize();
-		$this->assertEqual($this->Task->templatePaths['default'], $consoleLibs . 'templates' . DS . 'default' . DS);
+		$this->assertEqual($this->Task->templatePaths['default'], $consoleLibs . 'Templates' . DS . 'default' . DS);
 	}
 
 /**
@@ -99,7 +99,7 @@ public function testFindingInstalledThemesForBake() {
  * @return void
  */
 	public function testGetThemePath() {
-		$defaultTheme = CAKE . 'Console' . DS . 'templates' . DS . 'default' .DS;
+		$defaultTheme = CAKE . 'Console' . DS . 'Templates' . DS . 'default' .DS;
 		$this->Task->templatePaths = array('default' => $defaultTheme);
 
 		$this->Task->expects($this->exactly(1))->method('in')->will($this->returnValue('1'));

diff --git a/lib/Cake/Test/Case/Utility/FolderTest.php b/lib/Cake/Test/Case/Utility/FolderTest.php
@@ -146,7 +146,7 @@ public function testRecursiveCreateFailure() {
  * @return void
  */
 	public function testOperations() {
-		$path = CAKE . 'Console' . DS . 'templates' . DS . 'skel';
+		$path = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
 		$Folder = new Folder($path);
 
 		$result = is_dir($Folder->pwd());
@@ -219,7 +219,7 @@ public function testOperations() {
 	public function testChmod() {
 		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Folder permissions tests not supported on Windows.');
 
-		$path = CAKE . 'Console' . DS . 'templates' . DS . 'skel';
+		$path = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
 		$Folder = new Folder($path);
 
 		$subdir = 'test_folder_new';

diff --git a/...le/templates/test/classes/test_object.ctp → ...le/Templates/test/classes/test_object.ctp b/...le/templates/test/classes/test_object.ctp → ...le/Templates/test/classes/test_object.ctp
diff --git a/app/Vendor/shells/tasks/empty → ...Plugin/TestPlugin/Console/Templates/empty b/app/Vendor/shells/tasks/empty → ...Plugin/TestPlugin/Console/Templates/empty
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/templates/empty b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/templates/empty
diff --git a/app/Vendor/shells/templates/empty → ...gin/TestPluginTwo/Console/Templates/empty b/app/Vendor/shells/templates/empty → ...gin/TestPluginTwo/Console/Templates/empty
diff --git a/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/templates/empty b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/templates/empty