From dd4fbbab455e3e980975d41a41f1159a089c4d56 Mon Sep 17 00:00:00 2001 From: mark_story Date: Wed, 25 Nov 2009 22:50:50 -0500 Subject: [PATCH] Updating PluginTask to create webroot dir and no longer create vendors/css, vendors/js and vendors/img --- cake/console/libs/tasks/plugin.php | 7 +++---- cake/tests/cases/console/libs/tasks/plugin.test.php | 11 ++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php index 03b563dc1..75861b2f8 100644 --- a/cake/console/libs/tasks/plugin.php +++ b/cake/console/libs/tasks/plugin.php @@ -153,10 +153,9 @@ class PluginTask extends Shell { 'tests' . DS . 'cases' . DS . 'models', 'tests' . DS . 'groups', 'tests' . DS . 'fixtures', - 'vendors' . DS . 'img', - 'vendors' . DS . 'js', - 'vendors' . DS . 'css', - 'vendors' . DS . 'shells' . DS . 'tasks' + 'vendors', + 'vendors' . DS . 'shells' . DS . 'tasks', + 'webroot' ); foreach ($directories as $directory) { diff --git a/cake/tests/cases/console/libs/tasks/plugin.test.php b/cake/tests/cases/console/libs/tasks/plugin.test.php index 078d1c902..29521bb38 100644 --- a/cake/tests/cases/console/libs/tasks/plugin.test.php +++ b/cake/tests/cases/console/libs/tasks/plugin.test.php @@ -171,19 +171,12 @@ class PluginTaskTest extends CakeTestCase { $this->assertTrue(file_exists($path . DS . 'tests' . DS . 'fixtures' . DS . 'empty'), 'No empty file %s'); $this->assertTrue(is_dir($path . DS . 'vendors'), 'No vendors dir %s'); - $this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'css'), 'No vendors css dir %s'); - $this->assertTrue(file_exists($path . DS . 'vendors' . DS . 'css' . DS . 'empty'), 'No empty file %s'); - - $this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'js'), 'No vendors js dir %s'); - $this->assertTrue(file_exists($path . DS . 'vendors' . DS . 'js' . DS . 'empty'), 'No empty file %s'); - - $this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'img'), 'No vendors img dir %s'); - $this->assertTrue(file_exists($path . DS . 'vendors' . DS . 'img' . DS . 'empty'), 'No empty file %s'); - + $this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'shells'), 'No vendors shells dir %s'); $this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'shells' . DS . 'tasks'), 'No vendors shells tasks dir %s'); $this->assertTrue(file_exists($path . DS . 'vendors' . DS . 'shells' . DS . 'tasks' . DS . 'empty'), 'No empty file %s'); $this->assertTrue(is_dir($path . DS . 'libs'), 'No libs dir %s'); + $this->assertTrue(is_dir($path . DS . 'webroot'), 'No webroot dir %s'); $file = $path . DS . 'bake_test_plugin_app_controller.php'; $this->Task->expectAt(0, 'createFile', array($file, '*'), 'No AppController %s');