From 14820fe03fd8a0c0ca2e06daa057eae00a9f9d2a Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 17 Oct 2010 16:16:20 -0400 Subject: [PATCH] Moving more vendors/shells into console dirs. --- .../cases/console/shells/tasks/template.test.php | 5 ++--- .../{vendors => console}/shells/sample.php | 0 .../templates => console/shells/tasks}/empty | 0 .../templates/test/classes/test_object.ctp | 0 .../console/templates}/empty | 0 .../test_plugin_two/console/shells/.DS_Store | Bin 0 -> 6148 bytes .../{vendors => console}/shells/example.php | 0 .../templates => console/shells/tasks}/empty | 0 .../{vendors => console}/shells/welcome.php | 0 .../test_plugin_two/console/templates}/empty | 0 10 files changed, 2 insertions(+), 3 deletions(-) rename cake/tests/test_app/{vendors => console}/shells/sample.php (100%) rename cake/tests/test_app/{plugins/test_plugin/console/shells/templates => console/shells/tasks}/empty (100%) rename cake/tests/test_app/{vendors/shells => console}/templates/test/classes/test_object.ctp (100%) rename cake/tests/test_app/plugins/{test_plugin_two/vendors/shells/tasks => test_plugin/console/templates}/empty (100%) create mode 100644 cake/tests/test_app/plugins/test_plugin_two/console/shells/.DS_Store rename cake/tests/test_app/plugins/test_plugin_two/{vendors => console}/shells/example.php (100%) rename cake/tests/test_app/plugins/test_plugin_two/{vendors/shells/templates => console/shells/tasks}/empty (100%) rename cake/tests/test_app/plugins/test_plugin_two/{vendors => console}/shells/welcome.php (100%) rename cake/tests/test_app/{vendors/shells/tasks => plugins/test_plugin_two/console/templates}/empty (100%) diff --git a/cake/tests/cases/console/shells/tasks/template.test.php b/cake/tests/cases/console/shells/tasks/template.test.php index eb5c53627..c5c0eed16 100644 --- a/cake/tests/cases/console/shells/tasks/template.test.php +++ b/cake/tests/cases/console/shells/tasks/template.test.php @@ -48,7 +48,6 @@ class TemplateTaskTest extends CakeTestCase { array('in', 'err', 'createFile', '_stop', 'clear'), array(&$this->Dispatcher, $out, $out, $in) ); - $this->Task->Dispatch->shellPaths = App::path('shells'); } /** @@ -130,7 +129,7 @@ class TemplateTaskTest extends CakeTestCase { public function testGenerate() { App::build(array( 'shells' => array( - TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS . 'shells' . DS + TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'console' . DS ) )); $this->Task->initialize(); @@ -150,7 +149,7 @@ class TemplateTaskTest extends CakeTestCase { public function testGenerateWithTemplateFallbacks() { App::build(array( 'shells' => array( - TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS . 'shells' . DS, + TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'console' . DS, CAKE_CORE_INCLUDE_PATH . DS . 'console' . DS ) )); diff --git a/cake/tests/test_app/vendors/shells/sample.php b/cake/tests/test_app/console/shells/sample.php similarity index 100% rename from cake/tests/test_app/vendors/shells/sample.php rename to cake/tests/test_app/console/shells/sample.php diff --git a/cake/tests/test_app/plugins/test_plugin/console/shells/templates/empty b/cake/tests/test_app/console/shells/tasks/empty similarity index 100% rename from cake/tests/test_app/plugins/test_plugin/console/shells/templates/empty rename to cake/tests/test_app/console/shells/tasks/empty diff --git a/cake/tests/test_app/vendors/shells/templates/test/classes/test_object.ctp b/cake/tests/test_app/console/templates/test/classes/test_object.ctp similarity index 100% rename from cake/tests/test_app/vendors/shells/templates/test/classes/test_object.ctp rename to cake/tests/test_app/console/templates/test/classes/test_object.ctp diff --git a/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty b/cake/tests/test_app/plugins/test_plugin/console/templates/empty similarity index 100% rename from cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty rename to cake/tests/test_app/plugins/test_plugin/console/templates/empty diff --git a/cake/tests/test_app/plugins/test_plugin_two/console/shells/.DS_Store b/cake/tests/test_app/plugins/test_plugin_two/console/shells/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0