Permalink
Browse files

Partial migration of folders to camelcase in app

  • Loading branch information...
1 parent ac0ec44 commit 6737380deb98c24106dd37fa145daf4c3b9ca1ae @lorenzo lorenzo committed Mar 22, 2011
Showing with 88 additions and 44 deletions.
  1. 0 {lib/Cake/tests/test_app/views/scaffolds → app/Console/Command/Task}/empty
  2. 0 {lib/Cake/tests/test_app/views/pages → app/Console/Command}/empty
  3. 0 app/{console → Console}/cake
  4. 0 app/{console → Console}/cake.bat
  5. 0 app/{console → Console}/cake.php
  6. 0 {lib/Cake/tests/test_app/views/helpers → app/Console/templates}/empty
  7. 0 {lib/Cake/tests/test_app/views/errors → app/Controller/Component}/empty
  8. 0 {lib/Cake/tests/test_app/views/elements → app/Lib}/empty
  9. 0 {lib/Cake/tests/test_app/plugins/test_plugin_two/console/templates → app/Model/Behavior}/empty
  10. 0 {lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/tasks → app/Model/Datasource}/empty
  11. 0 {lib/Cake/tests/test_app/plugins/test_plugin/console/templates → app/View/Helper}/empty
  12. 0 ...ake/tests/test_app/plugins/test_plugin/console/shells/tasks → app/View/elements/email/html}/empty
  13. 0 {lib/Cake/tests/test_app/models/behaviors → app/View/elements/email/text}/empty
  14. 0 {lib/Cake/tests/test_app/controllers/components → app/View/elements}/empty
  15. 0 {lib/Cake/tests/test_app/console/shells/tasks → app/View/errors}/empty
  16. 0 app/{views/scaffolds → View/layouts/email/html}/empty
  17. 0 app/{views/pages → View/layouts/email/text}/empty
  18. 0 app/{views/layouts/xml → View/layouts/js}/empty
  19. 0 app/{views → View}/layouts/rss/empty
  20. 0 app/{views/layouts/js → View/layouts/xml}/empty
  21. 0 app/{views/layouts/email/text → View/pages}/empty
  22. 0 app/{views/layouts/email/html → View/scaffolds}/empty
  23. +49 −20 lib/Cake/Core/App.php
  24. +1 −1 lib/Cake/tests/cases/console/shells/command_list.test.php
  25. +4 −4 lib/Cake/tests/cases/console/shells/tasks/extract.test.php
  26. +12 −2 lib/Cake/tests/cases/libs/app.test.php
  27. +1 −1 lib/Cake/tests/cases/libs/controller/components/auth.test.php
  28. +2 −2 lib/Cake/tests/cases/libs/controller/components/request_handler.test.php
  29. +6 −8 lib/Cake/tests/cases/libs/controller/controller.test.php
  30. +3 −1 lib/Cake/tests/cases/libs/controller/pages_controller.test.php
  31. +6 −2 lib/Cake/tests/cases/libs/model/connection_manager.test.php
  32. +2 −2 lib/Cake/tests/cases/libs/view/helper.test.php
  33. +2 −1 lib/Cake/tests/cases/libs/view/view.test.php
  34. 0 lib/Cake/tests/test_app/{console/shells → Console/Command}/SampleShell.php
  35. 0 {app/views/helpers → lib/Cake/tests/test_app/Console/Command/Task}/empty
  36. 0 lib/Cake/tests/test_app/{console → Console}/templates/test/classes/test_object.ctp
  37. 0 {app/views/errors → lib/Cake/tests/test_app/Controller/Component}/empty
  38. 0 lib/Cake/tests/test_app/{controllers → Controller}/tests_apps_controller.php
  39. 0 lib/Cake/tests/test_app/{controllers → Controller}/tests_apps_posts_controller.php
  40. 0 lib/Cake/tests/test_app/{libs → Lib}/Cache/Engine/TestAppCacheEngine.php
  41. 0 lib/Cake/tests/test_app/{libs → Lib}/Log/Engine/TestAppLog.php
  42. 0 lib/Cake/tests/test_app/{libs → Lib}/Utility/TestUtilityClass.php
  43. 0 lib/Cake/tests/test_app/{libs → Lib}/library.php
  44. 0 {app/views/elements → lib/Cake/tests/test_app/Model/Behavior}/empty
  45. 0 lib/Cake/tests/test_app/{models/behaviors → Model/Behavior}/persister_one_behavior.php
  46. 0 lib/Cake/tests/test_app/{models/behaviors → Model/Behavior}/persister_two_behavior.php
  47. 0 ...Cake/tests/test_app/{models/datasources/database → Model/Datasource/Database}/TestLocalDriver.php
  48. 0 ...Cake/tests/test_app/{models/datasources/session → Model/Datasource/Session}/TestAppLibSession.php
  49. 0 lib/Cake/tests/test_app/{models/datasources → Model/Datasource}/test2_other_source.php
  50. 0 lib/Cake/tests/test_app/{models/datasources → Model/Datasource}/test2_source.php
  51. 0 lib/Cake/tests/test_app/{models → Model}/comment.php
  52. 0 lib/Cake/tests/test_app/{models → Model}/persister_one.php
  53. 0 lib/Cake/tests/test_app/{models → Model}/persister_two.php
  54. 0 lib/Cake/tests/test_app/{models → Model}/post.php
  55. 0 lib/Cake/tests/test_app/{views/helpers → View/Helper}/banana.php
  56. 0 {app/views/elements/email/text → lib/Cake/tests/test_app/View/Helper}/empty
  57. 0 lib/Cake/tests/test_app/{views → View}/elements/email/html/custom.ctp
  58. 0 lib/Cake/tests/test_app/{views → View}/elements/email/html/default.ctp
  59. 0 lib/Cake/tests/test_app/{views → View}/elements/email/html/nested_element.ctp
  60. 0 lib/Cake/tests/test_app/{views → View}/elements/email/text/custom.ctp
  61. 0 lib/Cake/tests/test_app/{views → View}/elements/email/text/default.ctp
  62. 0 lib/Cake/tests/test_app/{views → View}/elements/email/text/wide.ctp
  63. 0 {app/views/elements/email/html → lib/Cake/tests/test_app/View/elements}/empty
  64. 0 lib/Cake/tests/test_app/{views → View}/elements/html_call.ctp
  65. 0 lib/Cake/tests/test_app/{views → View}/elements/nocache/contains_nocache.ctp
  66. 0 lib/Cake/tests/test_app/{views → View}/elements/nocache/plain.ctp
  67. 0 lib/Cake/tests/test_app/{views → View}/elements/nocache/sub1.ctp
  68. 0 lib/Cake/tests/test_app/{views → View}/elements/nocache/sub2.ctp
  69. 0 lib/Cake/tests/test_app/{views → View}/elements/session_helper.ctp
  70. 0 lib/Cake/tests/test_app/{views → View}/elements/test_element.ctp
  71. 0 lib/Cake/tests/test_app/{views → View}/elements/type_check.ctp
  72. 0 {app/models/datasources → lib/Cake/tests/test_app/View/errors}/empty
  73. 0 lib/Cake/tests/test_app/{views → View}/layouts/ajax.ctp
  74. 0 lib/Cake/tests/test_app/{views → View}/layouts/ajax2.ctp
  75. 0 lib/Cake/tests/test_app/{views → View}/layouts/cache_empty_sections.ctp
  76. 0 lib/Cake/tests/test_app/{views → View}/layouts/cache_layout.ctp
  77. 0 lib/Cake/tests/test_app/{views → View}/layouts/default.ctp
  78. 0 lib/Cake/tests/test_app/{views → View}/layouts/email/html/default.ctp
  79. 0 lib/Cake/tests/test_app/{views → View}/layouts/email/html/thin.ctp
  80. 0 lib/Cake/tests/test_app/{views → View}/layouts/email/text/default.ctp
  81. 0 lib/Cake/tests/test_app/{views → View}/layouts/flash.ctp
  82. 0 lib/Cake/tests/test_app/{views → View}/layouts/js/default.ctp
  83. 0 lib/Cake/tests/test_app/{views → View}/layouts/json/default.ctp
  84. 0 lib/Cake/tests/test_app/{views → View}/layouts/multi_cache.ctp
  85. 0 lib/Cake/tests/test_app/{views → View}/layouts/rss/default.ctp
  86. 0 lib/Cake/tests/test_app/{views → View}/layouts/xml/default.ctp
  87. 0 {app/models/behaviors → lib/Cake/tests/test_app/View/pages}/empty
  88. 0 lib/Cake/tests/test_app/{views → View}/pages/extract.ctp
  89. 0 lib/Cake/tests/test_app/{views → View}/pages/home.ctp
  90. 0 lib/Cake/tests/test_app/{views → View}/posts/cache_empty_sections.ctp
  91. 0 lib/Cake/tests/test_app/{views → View}/posts/cache_form.ctp
  92. 0 lib/Cake/tests/test_app/{views → View}/posts/helper_overwrite.ctp
  93. 0 lib/Cake/tests/test_app/{views → View}/posts/index.ctp
  94. 0 lib/Cake/tests/test_app/{views → View}/posts/multiple_nocache.ctp
  95. 0 lib/Cake/tests/test_app/{views → View}/posts/nocache_multiple_element.ctp
  96. 0 lib/Cake/tests/test_app/{views → View}/posts/scaffold.form.ctp
  97. 0 lib/Cake/tests/test_app/{views → View}/posts/sequencial_nocache.ctp
  98. 0 lib/Cake/tests/test_app/{views → View}/posts/test_nocache_tags.ctp
  99. 0 {app/libs → lib/Cake/tests/test_app/View/scaffolds}/empty
  100. 0 lib/Cake/tests/test_app/{views → View}/tests_apps/index.ctp
  101. 0 lib/Cake/tests/test_app/{views → View}/tests_apps/json/index.ctp
  102. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/elements/test_element.ctp
  103. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/layouts/default.ctp
  104. 0 ...ke/tests/test_app/{views → View}/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
  105. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/plugins/test_plugin/tests/index.ctp
  106. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/posts/index.ctp
  107. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/posts/scaffold.index.ctp
  108. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/webroot/css/test_asset.css
  109. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/webroot/css/theme_webroot.css
  110. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/webroot/flash/theme_test.swf
  111. BIN lib/Cake/tests/test_app/{views → View}/themed/test_theme/webroot/img/cake.power.gif
  112. BIN lib/Cake/tests/test_app/{views → View}/themed/test_theme/webroot/img/test.jpg
  113. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/webroot/js/one/theme_one.js
  114. 0 lib/Cake/tests/test_app/{views → View}/themed/test_theme/webroot/js/theme.js
  115. BIN lib/Cake/tests/test_app/{views → View}/themed/test_theme/webroot/pdfs/theme_test.pdf
  116. 0 .../controllers/components → lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task}/empty
  117. 0 ...e/tests/test_app/plugins/test_plugin/{console/shells/tasks → Console/Command/Task}/other_task.php
  118. 0 lib/Cake/tests/test_app/plugins/test_plugin/{console/shells → Console/Command}/example.php
  119. 0 {app/console → lib/Cake/tests/test_app/plugins/test_plugin/Console}/templates/empty
  120. 0 .../test_app/plugins/test_plugin/{controllers/components → Controller/Component}/other_component.php
  121. 0 ...est_app/plugins/test_plugin/{controllers/components → Controller/Component}/plugins_component.php
  122. 0 ...app/plugins/test_plugin/{controllers/components → Controller/Component}/test_plugin_component.php
  123. 0 ...ugins/test_plugin/{controllers/components → Controller/Component}/test_plugin_other_component.php
  124. 0 ...Cake/tests/test_app/plugins/test_plugin/{controllers → Controller}/test_plugin_app_controller.php
  125. 0 lib/Cake/tests/test_app/plugins/test_plugin/{controllers → Controller}/test_plugin_controller.php
  126. 0 lib/Cake/tests/test_app/plugins/test_plugin/{controllers → Controller}/tests_controller.php
  127. 0 lib/Cake/tests/test_app/plugins/test_plugin/{libs → Lib}/Cache/Engine/TestPluginCacheEngine.php
  128. 0 lib/Cake/tests/test_app/plugins/test_plugin/{libs → Lib}/Custom/Package/CustomLibClass.php
  129. 0 lib/Cake/tests/test_app/plugins/test_plugin/{libs → Lib}/Log/Engine/TestPluginLog.php
  130. 0 lib/Cake/tests/test_app/plugins/test_plugin/{libs → Lib}/test_plugin_library.php
  131. 0 ...ts/test_app/plugins/test_plugin/{models/behaviors → Model/Behavior}/test_plugin_persister_one.php
  132. 0 ...ts/test_app/plugins/test_plugin/{models/behaviors → Model/Behavior}/test_plugin_persister_two.php
  133. 0 ...st_app/plugins/test_plugin/{models/datasources/database → Model/Datasource/Database}/DboDummy.php
  134. 0 ..._app/plugins/test_plugin/{models/datasources/database → Model/Datasource/Database}/TestDriver.php
  135. 0 ...plugins/test_plugin/{models/datasources/session → Model/Datasource/Session}/TestPluginSession.php
  136. 0 lib/Cake/tests/test_app/plugins/test_plugin/{models/datasources → Model/Datasource}/TestSource.php
  137. 0 .../tests/test_app/plugins/test_plugin/{models/datasources → Model/Datasource}/test_other_source.php
  138. 0 lib/Cake/tests/test_app/plugins/test_plugin/{models → Model}/test_plugin_app_model.php
  139. 0 lib/Cake/tests/test_app/plugins/test_plugin/{models → Model}/test_plugin_auth_user.php
  140. 0 lib/Cake/tests/test_app/plugins/test_plugin/{models → Model}/test_plugin_authors.php
  141. 0 lib/Cake/tests/test_app/plugins/test_plugin/{models → Model}/test_plugin_comment.php
  142. 0 lib/Cake/tests/test_app/plugins/test_plugin/{models → Model}/test_plugin_post.php
  143. 0 lib/Cake/tests/test_app/plugins/test_plugin/{views/helpers → View/Helper}/OtherHelperHelper.php
  144. 0 lib/Cake/tests/test_app/plugins/test_plugin/{views/helpers → View/Helper}/plugged_helper.php
  145. 0 lib/Cake/tests/test_app/plugins/test_plugin/{views/helpers → View/Helper}/test_plugin_app.php
  146. 0 lib/Cake/tests/test_app/plugins/test_plugin/{views → View}/elements/plugin_element.ctp
  147. 0 lib/Cake/tests/test_app/plugins/test_plugin/{views → View}/elements/test_plugin_element.ctp
  148. 0 lib/Cake/tests/test_app/plugins/test_plugin/{views → View}/layouts/default.ctp
  149. 0 lib/Cake/tests/test_app/plugins/test_plugin/{views → View}/tests/index.ctp
  150. 0 lib/Cake/tests/test_app/plugins/test_plugin/{views → View}/tests/scaffold.form.ctp
  151. 0 ...onsole/shells/tasks → lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/Task}/empty
  152. 0 lib/Cake/tests/test_app/plugins/test_plugin_two/{console/shells → Console/Command}/example.php
  153. 0 lib/Cake/tests/test_app/plugins/test_plugin_two/{console/shells → Console/Command}/welcome.php
  154. 0 {app/console/shells → lib/Cake/tests/test_app/plugins/test_plugin_two/Console/templates}/empty
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -203,7 +203,7 @@ public static function path($type, $plugin = null) {
$path[] = sprintf($f, $pluginPath);
}
}
- $path[] = $pluginPath . 'libs' . DS . $type . DS;
+ $path[] = $pluginPath . 'Lib' . DS . $type . DS;
return $path;
}
@@ -233,32 +233,61 @@ public static function path($type, $plugin = null) {
public static function build($paths = array(), $reset = false) {
if (empty(self::$__packageFormat)) {
self::$__packageFormat = array(
- 'Model' => array('%s' . 'models' . DS),
- 'Model/Behavior' => array('%s' . 'models' . DS . 'behaviors' . DS),
- 'Model/Datasource' => array('%s' . 'models' . DS . 'datasources' . DS),
- 'Model/Datasource/Database' => array('%s' . 'models' . DS . 'datasources' . DS . 'database' . DS),
- 'Model/Datasource/Session' => array('%s' . 'models' . DS . 'datasources' . DS . 'session' . DS),
- 'Controller' => array('%s' . 'controllers' . DS),
- 'Controller/Component' => array('%s' . 'controllers' . DS . 'components' . DS),
- 'View' => array('%s' . 'views' . DS),
- 'View/Helper' => array('%s' . 'views' . DS . 'helpers' . DS),
+ 'Model' => array(
+ '%s' . 'Model' . DS,
+ '%s' . 'models' . DS
+ ),
+ 'Model/Behavior' => array(
+ '%s' . 'Model' . DS . 'Behavior' . DS,
+ '%s' . 'models' . DS . 'behaviors' . DS
+ ),
+ 'Model/Datasource' => array(
+ '%s' . 'Model' . DS . 'Datasource' . DS,
+ '%s' . 'models' . DS . 'datasources' . DS
+ ),
+ 'Model/Datasource/Database' => array(
+ '%s' . 'Model' . DS . 'Datasource' . DS . 'Database' . DS,
+ '%s' . 'models' . DS . 'datasources' . DS . 'database' . DS
+ ),
+ 'Model/Datasource/Session' => array(
+ '%s' . 'Model' . DS . 'Datasource' . DS . 'Session' . DS,
+ '%s' . 'models' . DS . 'datasources' . DS . 'session' . DS
+ ),
+ 'Controller' => array(
+ '%s' . 'Controller' . DS,
+ '%s' . 'controllers' . DS
+ ),
+ 'Controller/Component' => array(
+ '%s' . 'Controller' . DS . 'Component' . DS,
+ '%s' . 'controllers' . DS . 'components' . DS
+ ),
+ 'View' => array(
+ '%s' . 'View' . DS,
+ '%s' . 'views' . DS
+ ),
+ 'View/Helper' => array(
+ '%s' . 'View' . DS . 'Helper' . DS,
+ '%s' . 'views' . DS . 'helpers' . DS
+ ),
'Console' => array(
- '%s' . 'console' . DS,
- '%s' . 'vendors' . DS . 'shells' . DS,
- VENDORS . 'shells' . DS
+ '%s' . 'Console' . DS,
+ '%s' . 'console' . DS
),
'Console/Command' => array(
+ '%s' . 'Console' . DS . 'Command' . DS,
'%s' . 'console' . DS . 'shells' . DS,
- '%s' . 'vendors' . DS . 'shells' . DS,
- VENDORS . 'shells' . DS
),
'Console/Command/Task' => array(
- '%s' . 'console' . DS . 'shells' . DS . 'tasks' . DS,
- '%s' . 'vendors' . DS . 'shells' . DS . 'tasks' . DS,
- VENDORS . 'shells' . DS . 'tasks' . DS
+ '%s' . 'Console' . DS . 'Command' . DS . 'Task' . DS,
+ '%s' . 'console' . DS . 'shells' . DS . 'tasks' . DS
+ ),
+ 'Lib' => array(
+ '%s' . 'Lib' . DS,
+ '%s' . 'libs' . DS
+ ),
+ 'locales' => array(
+ '%s' . 'locale' . DS
),
- 'Lib' => array('%s' . 'libs' . DS),
- 'locales' => array('%s' . 'locale' . DS),
'vendors' => array('%s' . 'vendors' . DS, VENDORS),
'plugins' => array(APP . 'plugins' . DS, CAKE_CORE_INCLUDE_PATH . DS . 'plugins' . DS)
);
@@ -44,7 +44,7 @@ public function setUp() {
LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
),
'Console/Command' => array(
- LIBS . 'tests' . DS . 'test_app' . DS . 'console' . DS . 'shells' . DS
+ LIBS . 'tests' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
)
), true);
App::objects('plugin', null, false);
@@ -70,7 +70,7 @@ public function tearDown() {
public function testExecute() {
$this->Task->interactive = false;
- $this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'pages';
+ $this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'pages';
$this->Task->params['output'] = $this->path . DS;
$this->Task->expects($this->never())->method('err');
$this->Task->expects($this->any())->method('in')
@@ -157,7 +157,7 @@ public function testExecute() {
function testExtractWithExclude() {
$this->Task->interactive = false;
- $this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'views';
+ $this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'View';
$this->Task->params['output'] = $this->path . DS;
$this->Task->params['exclude'] = 'pages,layouts';
@@ -184,8 +184,8 @@ function testExtractMultiplePaths() {
$this->Task->interactive = false;
$this->Task->params['paths'] =
- LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'pages,' .
- LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'posts';
+ LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'pages,' .
+ LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'posts';
$this->Task->params['output'] = $this->path . DS;
$this->Task->expects($this->never())->method('err');
@@ -16,6 +16,7 @@ class AppImportTest extends CakeTestCase {
function testBuild() {
$old = App::path('Model');
$expected = array(
+ APP . 'Model' . DS,
APP . 'models' . DS
);
$this->assertEqual($expected, $old);
@@ -26,6 +27,7 @@ function testBuild() {
$expected = array(
'/path/to/models/',
+ APP . 'Model' . DS,
APP . 'models' . DS
);
$this->assertEqual($expected, $new);
@@ -44,6 +46,7 @@ function testBuild() {
function testCompatibleBuild() {
$old = App::path('models');
$expected = array(
+ APP . 'Model' . DS,
APP . 'models' . DS
);
$this->assertEqual($expected, $old);
@@ -54,6 +57,7 @@ function testCompatibleBuild() {
$expected = array(
'/path/to/models/',
+ APP . 'Model' . DS,
APP . 'models' . DS
);
$this->assertEqual($expected, $new);
@@ -62,6 +66,7 @@ function testCompatibleBuild() {
App::build(array('datasources' => array('/path/to/datasources/')));
$expected = array(
'/path/to/datasources/',
+ APP . 'Model' . DS . 'Datasource' . DS,
APP . 'models' . DS . 'datasources' . DS
);
$result = App::path('datasources');
@@ -71,6 +76,7 @@ function testCompatibleBuild() {
App::build(array('behaviors' => array('/path/to/behaviors/')));
$expected = array(
'/path/to/behaviors/',
+ APP . 'Model' . DS . 'Behavior' . DS,
APP . 'models' . DS . 'behaviors' . DS
);
$result = App::path('behaviors');
@@ -80,6 +86,7 @@ function testCompatibleBuild() {
App::build(array('controllers' => array('/path/to/controllers/')));
$expected = array(
'/path/to/controllers/',
+ APP . 'Controller' . DS,
APP . 'controllers' . DS
);
$result = App::path('controllers');
@@ -89,6 +96,7 @@ function testCompatibleBuild() {
App::build(array('components' => array('/path/to/components/')));
$expected = array(
'/path/to/components/',
+ APP . 'Controller' . DS . 'Component' . DS,
APP . 'controllers' . DS . 'components' . DS
);
$result = App::path('components');
@@ -98,6 +106,7 @@ function testCompatibleBuild() {
App::build(array('views' => array('/path/to/views/')));
$expected = array(
'/path/to/views/',
+ APP . 'View' . DS,
APP . 'views' . DS
);
$result = App::path('views');
@@ -107,6 +116,7 @@ function testCompatibleBuild() {
App::build(array('helpers' => array('/path/to/helpers/')));
$expected = array(
'/path/to/helpers/',
+ APP . 'View' . DS . 'Helper' .DS,
APP . 'views' . DS . 'helpers' . DS
);
$result = App::path('helpers');
@@ -116,9 +126,8 @@ function testCompatibleBuild() {
App::build(array('shells' => array('/path/to/shells/')));
$expected = array(
'/path/to/shells/',
+ APP . 'Console' . DS . 'Command' . DS,
APP . 'console' . DS . 'shells' . DS,
- APP . 'vendors' . DS . 'shells' . DS,
- ROOT . DS . 'vendors' . DS . 'shells' . DS
);
$result = App::path('shells');
$this->assertEqual($expected, $result);
@@ -138,6 +147,7 @@ function testCompatibleBuild() {
function testBuildWithReset() {
$old = App::path('Model');
$expected = array(
+ APP . 'Model' . DS,
APP . 'models' . DS
);
$this->assertEqual($expected, $old);
@@ -948,7 +948,7 @@ function testAdminRoute() {
*/
function testAjaxLogin() {
App::build(array(
- 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+ 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
));
$_SERVER['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest";
@@ -670,7 +670,7 @@ function testClientProperties() {
*/
function testAjaxRedirectAsRequestAction() {
App::build(array(
- 'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+ 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
), true);
$this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
@@ -699,7 +699,7 @@ function testAjaxRedirectAsRequestAction() {
*/
function testAjaxRedirectAsRequestActionStillRenderingLayout() {
App::build(array(
- 'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+ 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
), true);
$this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
@@ -439,8 +439,8 @@ function testLoadModel() {
function testLoadModelInPlugins() {
App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
- 'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'controllers' . DS),
- 'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS)
+ 'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
+ 'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
));
App::uses('TestPluginAppController', 'TestPlugin.Controller');
App::uses('TestPluginController', 'TestPlugin.Controller');
@@ -578,7 +578,7 @@ function testFlash() {
$this->assertEqual($result, $expected);
App::build(array(
- 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+ 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
));
$Controller = new Controller($request);
$Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
@@ -640,7 +640,7 @@ function testControllerSet() {
*/
function testRender() {
App::build(array(
- 'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+ 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
), true);
$request = new CakeRequest('controller_posts/index');
$request->params['action'] = 'index';
@@ -684,11 +684,9 @@ function testRender() {
* @return void
*/
function testComponentBeforeRenderChangingViewClass() {
- $core = App::core('views');
App::build(array(
- 'views' => array(
- LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS,
- $core[0]
+ 'View' => array(
+ LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
)
), true);
$Controller = new Controller($this->getMock('CakeRequest'));
@@ -44,7 +44,9 @@ function endTest() {
*/
function testDisplay() {
App::build(array(
- 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS, LIBS . 'libs' . DS . 'view' . DS)
+ 'View' => array(
+ LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
+ )
));
$Pages = new PagesController(new CakeRequest(null, false));
@@ -141,7 +141,9 @@ function testGetLocalDataSourceAndPluginDriver() {
function testGetPluginDataSourceAndLocalDriver() {
App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
- 'Model/Datasource/Database' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS . 'Database' . DS)
+ 'Model/Datasource/Database' => array(
+ LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
+ )
));
$name = 'test_plugin_source_and_local_driver';
@@ -262,7 +264,9 @@ function testCreateDataSourceWithIntegrationTests() {
function testConnectionData() {
App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
- 'Model/Datasource' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
+ 'Model/Datasource' => array(
+ LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
+ )
));
$expected = array(
@@ -518,7 +518,7 @@ function testAssetTimestampPluginsAndThemes() {
Configure::write('Asset.timestamp', 'force');
App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
- 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+ 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
));
$result = $this->Helper->assetTimestamp('/test_plugin/css/test_plugin_asset.css');
@@ -757,7 +757,7 @@ function testWebrootPaths() {
$this->Helper->theme = 'test_theme';
App::build(array(
- 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+ 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
));
$result = $this->Helper->webroot('/img/cake.power.gif');
@@ -260,8 +260,9 @@ function testPluginPathGeneration() {
$expected = array(
LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'plugins' . DS . 'test_plugin' . DS,
+ LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'View' . DS,
LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'views' . DS,
- LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'libs' . DS . 'View' . DS,
+ LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'Lib' . DS . 'View' . DS,
LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS,
LIBS . 'View' . DS
);
File renamed without changes.

0 comments on commit 6737380

Please sign in to comment.