Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Upgrade legacy uses of App::build() types

  • Loading branch information...
commit 22582aee6395bbbaefe4704bf3c7dcd0949ccc6e 1 parent c4829dc
Kyle Robinson Young shama authored
Showing with 81 additions and 81 deletions.
  1. +1 −1  app/Config/bootstrap.php
  2. +1 −1  lib/Cake/Console/Templates/skel/Config/bootstrap.php
  3. +1 −1  lib/Cake/Test/Case/BasicsTest.php
  4. +5 −5 lib/Cake/Test/Case/Cache/CacheTest.php
  5. +1 −1  lib/Cake/Test/Case/Configure/PhpReaderTest.php
  6. +1 −1  lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
  7. +5 −5 lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
  8. +4 −4 lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
  9. +1 −1  lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
  10. +1 −1  lib/Cake/Test/Case/Console/ShellDispatcherTest.php
  11. +2 −2 lib/Cake/Test/Case/Console/ShellTest.php
  12. +1 −1  lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php
  13. +1 −1  lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
  14. +2 −2 lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
  15. +1 −1  lib/Cake/Test/Case/Controller/ComponentTest.php
  16. +2 −2 lib/Cake/Test/Case/Controller/ControllerTest.php
  17. +1 −1  lib/Cake/Test/Case/Core/CakePluginTest.php
  18. +8 −8 lib/Cake/Test/Case/Core/ObjectTest.php
  19. +1 −1  lib/Cake/Test/Case/Error/ErrorHandlerTest.php
  20. +1 −1  lib/Cake/Test/Case/Error/ExceptionRendererTest.php
  21. +3 −3 lib/Cake/Test/Case/I18n/I18nTest.php
  22. +2 −2 lib/Cake/Test/Case/Log/CakeLogTest.php
  23. +1 −1  lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
  24. +2 −2 lib/Cake/Test/Case/Model/CakeSchemaTest.php
  25. +5 −5 lib/Cake/Test/Case/Model/ConnectionManagerTest.php
  26. +2 −2 lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
  27. +1 −1  lib/Cake/Test/Case/Model/DbAclTest.php
  28. +2 −2 lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
  29. +4 −4 lib/Cake/Test/Case/Routing/DispatcherTest.php
  30. +2 −2 lib/Cake/Test/Case/Routing/RouterTest.php
  31. +1 −1  lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
  32. +1 −1  lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
  33. +2 −2 lib/Cake/Test/Case/Utility/CakeTimeTest.php
  34. +1 −1  lib/Cake/Test/Case/View/Helper/FormHelperTest.php
  35. +4 −4 lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
  36. +2 −2 lib/Cake/Test/Case/View/HelperCollectionTest.php
  37. +2 −2 lib/Cake/Test/Case/View/HelperTest.php
  38. +1 −1  lib/Cake/Test/Case/View/ThemeViewTest.php
  39. +2 −2 lib/Cake/Test/Case/View/ViewTest.php
2  app/Config/bootstrap.php
View
@@ -99,7 +99,7 @@
* 'View/Helper' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
* 'Vendor' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
* 'Console/Command' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
- * 'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
+ * 'Locale' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
* ));
*
*/
2  lib/Cake/Console/Templates/skel/Config/bootstrap.php
View
@@ -40,7 +40,7 @@
* 'View/Helper' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
* 'Vendor' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
* 'Console/Command' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
- * 'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
+ * 'Locale' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
* ));
*
*/
2  lib/Cake/Test/Case/BasicsTest.php
View
@@ -35,7 +35,7 @@ class BasicsTest extends CakeTestCase {
*/
public function setUp() {
App::build(array(
- 'locales' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
+ 'Locale' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
));
$this->_language = Configure::read('Config.language');
}
10 lib/Cake/Test/Case/Cache/CacheTest.php
View
@@ -87,7 +87,7 @@ public function testNonFatalErrorsWithCachedisable() {
public function testConfigWithLibAndPluginEngines() {
App::build(array(
'Lib' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
@@ -258,8 +258,8 @@ public function testInitSettings() {
*/
public function testDrop() {
App::build(array(
- 'libs' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Lib' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
$result = Cache::drop('some_config_that_does_not_exist');
@@ -310,8 +310,8 @@ public function testWriteEmptyValues() {
*/
public function testWriteTriggerError() {
App::build(array(
- 'libs' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Lib' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
Cache::config('test_trigger', array('engine' => 'TestAppCache', 'prefix' => ''));
2  lib/Cake/Test/Case/Configure/PhpReaderTest.php
View
@@ -84,7 +84,7 @@ public function testReadWithDots() {
*/
public function testReadPluginValue() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
$reader = new PhpReader($this->path);
2  lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
View
@@ -40,7 +40,7 @@ class CommandListShellTest extends CakeTestCase {
public function setUp() {
parent::setUp();
App::build(array(
- 'plugins' => array(
+ 'Plugin' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
),
'Console/Command' => array(
10 lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
View
@@ -182,7 +182,7 @@ public function testView() {
*/
public function testViewWithPlugins() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
CakePlugin::load('TestPlugin');
$this->Shell->args = array('TestPlugin.schema');
@@ -234,7 +234,7 @@ public function testDumpWithFileWriting() {
*/
public function testDumpFileWritingWithPlugins() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
CakePlugin::load('TestPlugin');
$this->Shell->args = array('TestPlugin.TestPluginApp');
@@ -335,7 +335,7 @@ public function testGenerateOverwrite() {
*/
public function testGenerateWithPlugins() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
@@ -450,7 +450,7 @@ public function testUpdateWithTable() {
*/
public function testPluginParam() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
CakePlugin::load('TestPlugin');
$this->Shell->params = array(
@@ -470,7 +470,7 @@ public function testPluginParam() {
*/
public function testPluginDotSyntaxWithCreate() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
CakePlugin::load('TestPlugin');
$this->Shell->params = array(
8 lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
View
@@ -225,7 +225,7 @@ public function testExtractMultiplePaths() {
*/
public function testExtractExcludePlugins() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
$this->out = $this->getMock('ConsoleOutput', array(), array(), '', false);
$this->in = $this->getMock('ConsoleInput', array(), array(), '', false);
@@ -251,7 +251,7 @@ public function testExtractExcludePlugins() {
*/
public function testExtractPlugin() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
$this->out = $this->getMock('ConsoleOutput', array(), array(), '', false);
@@ -279,7 +279,7 @@ public function testExtractPlugin() {
public function testExtractModelValidation() {
App::build(array(
'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
$this->out = $this->getMock('ConsoleOutput', array(), array(), '', false);
$this->in = $this->getMock('ConsoleInput', array(), array(), '', false);
@@ -366,7 +366,7 @@ public function testExtractModelValidationWithDomainInModel() {
*/
public function testExtractModelValidationInPlugin() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
$this->out = $this->getMock('ConsoleOutput', array(), array(), '', false);
$this->in = $this->getMock('ConsoleInput', array(), array(), '', false);
2  lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
View
@@ -572,7 +572,7 @@ public function testBakeWithPlugin() {
public function testInteractiveWithPlugin() {
$testApp = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS;
App::build(array(
- 'plugins' => array($testApp)
+ 'Plugin' => array($testApp)
), App::RESET);
CakePlugin::load('TestPlugin');
2  lib/Cake/Test/Case/Console/ShellDispatcherTest.php
View
@@ -113,7 +113,7 @@ class ShellDispatcherTest extends CakeTestCase {
public function setUp() {
parent::setUp();
App::build(array(
- 'plugins' => array(
+ 'Plugin' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
),
'Console/Command' => array(
4 lib/Cake/Test/Case/Console/ShellTest.php
View
@@ -171,8 +171,8 @@ public function testMergeVars() {
*/
public function testInitialize() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
- 'models' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
2  lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php
View
@@ -159,7 +159,7 @@ public function testAuthenticateScopeFail() {
public function testPluginModel() {
Cache::delete('object_map', '_cake_core_');
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
), App::RESET);
CakePlugin::load('TestPlugin');
2  lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
View
@@ -819,7 +819,7 @@ public function testReset() {
public function testPluginCustomViewClass() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
));
4 lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
View
@@ -86,7 +86,7 @@ public function testLoadWithAlias() {
$result = $this->Components->load('Cookie');
$this->assertInstanceOf('CookieAliasComponent', $result);
- App::build(array('plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
+ App::build(array('Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
CakePlugin::load('TestPlugin');
$result = $this->Components->load('SomeOther', array('className' => 'TestPlugin.Other'));
$this->assertInstanceOf('OtherComponent', $result);
@@ -128,7 +128,7 @@ public function testLoadMissingComponent() {
*/
public function testLoadPluginComponent() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
));
CakePlugin::load('TestPlugin');
$result = $this->Components->load('TestPlugin.Other');
2  lib/Cake/Test/Case/Controller/ComponentTest.php
View
@@ -219,7 +219,7 @@ class ComponentTest extends CakeTestCase {
public function setUp() {
$this->_pluginPaths = App::path('plugins');
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
}
4 lib/Cake/Test/Case/Controller/ControllerTest.php
View
@@ -460,7 +460,7 @@ public function testLoadModel() {
*/
public function testLoadModelInPlugins() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'Controller' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
));
@@ -501,7 +501,7 @@ public function testConstructClasses() {
unset($Controller);
- App::build(array('plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
+ App::build(array('Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
CakePlugin::load('TestPlugin');
$Controller = new Controller($request);
2  lib/Cake/Test/Case/Core/CakePluginTest.php
View
@@ -32,7 +32,7 @@ class CakePluginTest extends CakeTestCase {
*/
public function setUp() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
App::objects('plugins', null, false);
}
16 lib/Cake/Test/Case/Core/ObjectTest.php
View
@@ -446,9 +446,9 @@ public function testMethodDispatching() {
*/
public function testRequestAction() {
App::build(array(
- 'models' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
- 'views' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),
- 'controllers' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS)
+ 'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
+ 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),
+ 'Controller' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS)
), App::RESET);
$this->assertNull(Router::getRequest(), 'request stack should be empty.');
@@ -488,7 +488,7 @@ public function testRequestAction() {
*/
public function testRequestActionPlugins() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
), App::RESET);
CakePlugin::load('TestPlugin');
Router::reload();
@@ -525,10 +525,10 @@ public function testRequestActionPlugins() {
*/
public function testRequestActionArray() {
App::build(array(
- 'models' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
- 'views' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),
- 'controllers' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin'. DS)
+ 'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
+ 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),
+ 'Controller' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin'. DS)
), App::RESET);
CakePlugin::load(array('TestPlugin'));
2  lib/Cake/Test/Case/Error/ErrorHandlerTest.php
View
@@ -229,7 +229,7 @@ public function testHandleExceptionLog() {
*/
public function testLoadPluginHanlder() {
App::build(array(
- 'plugins' => array(
+ 'Plugin' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
)
), App::RESET);
2  lib/Cake/Test/Case/Error/ExceptionRendererTest.php
View
@@ -152,7 +152,7 @@ class ExceptionRendererTest extends CakeTestCase {
public function setUp() {
parent::setUp();
App::build(array(
- 'views' => array(
+ 'View' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS
)
), App::RESET);
6 lib/Cake/Test/Case/I18n/I18nTest.php
View
@@ -33,8 +33,8 @@ class I18nTest extends CakeTestCase {
public function setUp() {
Cache::delete('object_map', '_cake_core_');
App::build(array(
- 'locales' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS),
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Locale' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load(array('TestPlugin'));
}
@@ -2398,7 +2398,7 @@ public function testNoCoreTranslation () {
*/
public function testPluginTranslation() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
Configure::write('Config.language', 'po');
4 lib/Cake/Test/Case/Log/CakeLogTest.php
View
@@ -47,8 +47,8 @@ public function setUp() {
*/
public function testImportingLoggers() {
App::build(array(
- 'libs' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Lib' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
2  lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
View
@@ -451,7 +451,7 @@ public function testLoadAlias() {
$this->assertEquals($Apple->testMethod(true), 'working');
$this->assertEquals($Apple->Behaviors->dispatchMethod($Apple, 'testMethod'), 'working');
- App::build(array('plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
+ App::build(array('Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
CakePlugin::load('TestPlugin');
$this->assertTrue($Apple->Behaviors->load('SomeOther', array('className' => 'TestPlugin.TestPluginPersisterOne')));
$this->assertInstanceOf('TestPluginPersisterOneBehavior', $Apple->Behaviors->SomeOther);
4 lib/Cake/Test/Case/Model/CakeSchemaTest.php
View
@@ -669,7 +669,7 @@ public function testSchemaReadWithConfigPrefix() {
public function testSchemaReadWithPlugins() {
App::objects('model', null, false);
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
CakePlugin::load('TestPlugin');
@@ -982,7 +982,7 @@ public function testSchemaLoading() {
*/
public function testSchemaLoadingFromPlugin() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
CakePlugin::load('TestPlugin');
$Other = $this->Schema->load(array('name' => 'TestPluginApp', 'plugin' => 'TestPlugin'));
10 lib/Cake/Test/Case/Model/ConnectionManagerTest.php
View
@@ -88,7 +88,7 @@ public function testGetDataSourceException() {
*/
public function testGetPluginDataSource() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
$name = 'test_source';
@@ -109,7 +109,7 @@ public function testGetPluginDataSource() {
*/
public function testGetPluginDataSourceAndPluginDriver() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
$name = 'test_plugin_source_and_driver';
@@ -132,7 +132,7 @@ public function testGetPluginDataSourceAndPluginDriver() {
*/
public function testGetLocalDataSourceAndPluginDriver() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
CakePlugin::load('TestPlugin');
$name = 'test_local_source_and_plugin_driver';
@@ -154,7 +154,7 @@ public function testGetLocalDataSourceAndPluginDriver() {
*/
public function testGetPluginDataSourceAndLocalDriver() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'Model/Datasource/Database' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
)
@@ -270,7 +270,7 @@ public function testCreateDataSourceWithIntegrationTests() {
*/
public function testConnectionData() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'Model/Datasource' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
)
4 lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
View
@@ -503,7 +503,7 @@ public function testUsingAppLibsHandler() {
'Model/Datasource/Session' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
),
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
Configure::write('Session', array(
'defaults' => 'cake',
@@ -524,7 +524,7 @@ public function testUsingAppLibsHandler() {
*/
public function testUsingPluginHandler() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
2  lib/Cake/Test/Case/Model/DbAclTest.php
View
@@ -368,7 +368,7 @@ public function testNodeAliasParenting() {
*/
public function testNodeActionAuthorize() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load('TestPlugin');
4 lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
View
@@ -110,7 +110,7 @@ public function setUp() {
$this->CakeEmail = new TestCakeEmail();
App::build(array(
- 'views' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
+ 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
));
}
@@ -1036,7 +1036,7 @@ public function testSendRenderWithHelpers() {
*/
public function testSendRenderPlugin() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
CakePlugin::load('TestPlugin');
8 lib/Cake/Test/Case/Routing/DispatcherTest.php
View
@@ -1037,7 +1037,7 @@ public function testPluginShortCutUrlsWithControllerThatNeedsToBeLoaded() {
Router::reload();
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
@@ -1113,7 +1113,7 @@ public function testAutomaticPluginControllerIndexMissingAction() {
public function testTestPluginDispatch() {
$Dispatcher = new TestDispatcher();
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
Router::reload();
@@ -1172,8 +1172,8 @@ public function testAssets() {
Router::reload();
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
- 'vendors' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor'. DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Vendor' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor'. DS),
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
));
CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
4 lib/Cake/Test/Case/Routing/RouterTest.php
View
@@ -133,7 +133,7 @@ public function testMapResources() {
*/
public function testPluginMapResources() {
App::build(array(
- 'plugins' => array(
+ 'Plugin' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
)
));
@@ -173,7 +173,7 @@ public function testPluginMapResources() {
*/
public function testPluginMapResourcesWithPrefix() {
App::build(array(
- 'plugins' => array(
+ 'Plugin' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
)
));
2  lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
View
@@ -120,7 +120,7 @@ class ControllerTestCaseTest extends CakeTestCase {
public function setUp() {
parent::setUp();
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'Controller' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
2  lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
View
@@ -29,7 +29,7 @@ class HtmlCoverageReportTest extends CakeTestCase {
public function setUp() {
parent::setUp();
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET);
CakePlugin::load(array('TestPlugin'));
$reporter = new CakeBaseReporter();
4 lib/Cake/Test/Case/Utility/CakeTimeTest.php
View
@@ -655,7 +655,7 @@ public function testFromString() {
*/
public function testConvertSpecifiers() {
App::build(array(
- 'locales' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
+ 'Locale' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
), App::RESET);
Configure::write('Config.language', 'time_test');
$time = strtotime('Thu Jan 14 11:43:39 2010');
@@ -762,7 +762,7 @@ public function testConvertPercentE() {
*/
public function testI18nFormat() {
App::build(array(
- 'locales' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
+ 'Locale' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
), App::RESET);
Configure::write('Config.language', 'time_test');
2  lib/Cake/Test/Case/View/Helper/FormHelperTest.php
View
@@ -7759,7 +7759,7 @@ public function testHtml5InputException() {
public function testIntrospectModelFromRequest() {
$this->loadFixtures('Post');
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
));
CakePlugin::load('TestPlugin');
$this->Form->request['models'] = array('TestPluginPost' => array('plugin' => 'TestPlugin', 'className' => 'TestPluginPost'));
8 lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
View
@@ -150,7 +150,7 @@ public function setUp() {
$this->Html->request->webroot = '';
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin'. DS)
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin'. DS)
));
Configure::write('Asset.timestamp', false);
@@ -404,7 +404,7 @@ public function testImageTagWithTheme() {
$File = new File($testfile, true);
App::build(array(
- 'views' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
+ 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
));
Configure::write('Asset.timestamp', true);
Configure::write('debug', 1);
@@ -442,7 +442,7 @@ public function testImageTagWithTheme() {
*/
public function testThemeAssetsInMainWebrootPath() {
App::build(array(
- 'views' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
+ 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
));
$webRoot = Configure::read('App.www_root');
Configure::write('App.www_root', CAKE . 'Test' . DS . 'test_app' . DS . 'webroot' . DS);
@@ -933,7 +933,7 @@ public function testScriptInTheme() {
$File = new File($testfile, true);
App::build(array(
- 'views' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
+ 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
));
$this->Html->webroot = '/';
4 lib/Cake/Test/Case/View/HelperCollectionTest.php
View
@@ -84,7 +84,7 @@ public function testLoadWithAlias() {
$result = $this->Helpers->load('Html');
$this->assertInstanceOf('HtmlAliasHelper', $result);
- App::build(array('plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
+ App::build(array('Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
CakePlugin::load(array('TestPlugin'));
$result = $this->Helpers->load('SomeOther', array('className' => 'TestPlugin.OtherHelper'));
$this->assertInstanceOf('OtherHelperHelper', $result);
@@ -125,7 +125,7 @@ public function testLoadMissingHelper() {
*/
public function testLoadPluginHelper() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
));
CakePlugin::load(array('TestPlugin'));
$result = $this->Helpers->load('TestPlugin.OtherHelper');
4 lib/Cake/Test/Case/View/HelperTest.php
View
@@ -200,7 +200,7 @@ public function setUp() {
ClassRegistry::addObject('HelperTestTag', new HelperTestTag());
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
));
}
@@ -886,7 +886,7 @@ public function testWebrootPaths() {
*/
public function testLazyLoadingHelpers() {
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
));
CakePlugin::load(array('TestPlugin'));
$Helper = new TestHelper($this->View);
2  lib/Cake/Test/Case/View/ThemeViewTest.php
View
@@ -111,7 +111,7 @@ public function setUp() {
$this->PostsController->index();
$this->ThemeView = new ThemeView($this->PostsController);
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
));
App::objects('plugins', null, false);
4 lib/Cake/Test/Case/View/ViewTest.php
View
@@ -269,7 +269,7 @@ public function setUp() {
$this->ThemeView = new View($this->ThemePostsController);
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
), App::RESET);
App::objects('plugins', null, false);
@@ -420,7 +420,7 @@ public function testCamelCasePluginGetTemplate() {
$View = new TestView($this->Controller);
App::build(array(
- 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+ 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
));
Please sign in to comment.
Something went wrong with that request. Please try again.