From 6f821e0d4dde713fbaea2f9d9136f59efc999837 Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Mon, 30 May 2011 23:03:49 -0400 Subject: [PATCH] Changes relatives to templates from last commit. --- app/Console/{templates => Templates}/empty | 0 lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php | 6 +++--- .../Test/Case/Console/Command/Task/TemplateTaskTest.php | 4 ++-- lib/Cake/Test/Case/Utility/FolderTest.php | 4 ++-- .../{templates => Templates}/test/classes/test_object.ctp | 0 .../test_app/Plugin/TestPlugin/Console/Templates}/empty | 0 .../Test/test_app/Plugin/TestPlugin/Console/templates/empty | 0 .../test_app/Plugin/TestPluginTwo/Console/Templates}/empty | 0 .../test_app/Plugin/TestPluginTwo/Console/templates/empty | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename app/Console/{templates => Templates}/empty (100%) rename lib/Cake/Test/test_app/Console/{templates => Templates}/test/classes/test_object.ctp (100%) rename {app/Vendor/shells/tasks => lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates}/empty (100%) delete mode 100644 lib/Cake/Test/test_app/Plugin/TestPlugin/Console/templates/empty rename {app/Vendor/shells/templates => lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates}/empty (100%) delete mode 100644 lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/templates/empty diff --git a/app/Console/templates/empty b/app/Console/Templates/empty similarity index 100% rename from app/Console/templates/empty rename to 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 index 69c66071c..e688a4c70 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php @@ -70,7 +70,7 @@ class ProjectTaskTest extends CakeTestCase { * @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 @@ class ProjectTaskTest extends CakeTestCase { */ 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 @@ class ProjectTaskTest extends CakeTestCase { * @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 index 660b61a70..a7214ae9a 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php @@ -89,7 +89,7 @@ class TemplateTaskTest extends CakeTestCase { 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 @@ class TemplateTaskTest extends CakeTestCase { * @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 index 4db439114..5473599ea 100644 --- a/lib/Cake/Test/Case/Utility/FolderTest.php +++ b/lib/Cake/Test/Case/Utility/FolderTest.php @@ -146,7 +146,7 @@ class FolderTest extends CakeTestCase { * @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 @@ class FolderTest extends CakeTestCase { 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/lib/Cake/Test/test_app/Console/templates/test/classes/test_object.ctp b/lib/Cake/Test/test_app/Console/Templates/test/classes/test_object.ctp similarity index 100% rename from lib/Cake/Test/test_app/Console/templates/test/classes/test_object.ctp rename to lib/Cake/Test/test_app/Console/Templates/test/classes/test_object.ctp diff --git a/app/Vendor/shells/tasks/empty b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty similarity index 100% rename from app/Vendor/shells/tasks/empty rename to lib/Cake/Test/test_app/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 deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/Vendor/shells/templates/empty b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty similarity index 100% rename from app/Vendor/shells/templates/empty rename to lib/Cake/Test/test_app/Plugin/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 deleted file mode 100644 index e69de29bb..000000000