From c4829dc3b86bda5bd501bef0881ad08d80e8de8b Mon Sep 17 00:00:00 2001 From: Kyle Robinson Young Date: Sat, 18 Feb 2012 04:04:54 -0800 Subject: [PATCH] Use App::RESET instead of true with App::build() --- lib/Cake/Test/Case/Cache/CacheTest.php | 6 +++--- lib/Cake/Test/Case/Configure/PhpReaderTest.php | 2 +- lib/Cake/Test/Case/Console/Command/CommandListShellTest.php | 2 +- lib/Cake/Test/Case/Console/Command/SchemaShellTest.php | 2 +- lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php | 2 +- lib/Cake/Test/Case/Console/ShellDispatcherTest.php | 2 +- lib/Cake/Test/Case/Console/ShellTest.php | 2 +- .../Case/Controller/Component/Auth/FormAuthenticateTest.php | 2 +- .../Controller/Component/RequestHandlerComponentTest.php | 4 ++-- lib/Cake/Test/Case/Controller/ControllerTest.php | 2 +- lib/Cake/Test/Case/Core/CakePluginTest.php | 2 +- lib/Cake/Test/Case/Core/ConfigureTest.php | 4 +++- lib/Cake/Test/Case/Core/ObjectTest.php | 6 +++--- lib/Cake/Test/Case/Error/ErrorHandlerTest.php | 4 ++-- lib/Cake/Test/Case/Error/ExceptionRendererTest.php | 2 +- lib/Cake/Test/Case/I18n/I18nTest.php | 2 +- lib/Cake/Test/Case/Log/CakeLogTest.php | 2 +- lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php | 4 ++-- lib/Cake/Test/Case/Routing/DispatcherTest.php | 6 +++--- lib/Cake/Test/Case/Routing/RouterTest.php | 4 ++-- lib/Cake/Test/Case/Utility/CakeTimeTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/CacheHelperTest.php | 2 +- lib/Cake/Test/Case/View/Helper/NumberHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/TextHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/Helper/TimeHelperTest.php | 4 ++-- lib/Cake/Test/Case/View/ViewTest.php | 2 +- 26 files changed, 42 insertions(+), 40 deletions(-) diff --git a/lib/Cake/Test/Case/Cache/CacheTest.php b/lib/Cake/Test/Case/Cache/CacheTest.php index 2711a3068..db2193eeb 100644 --- a/lib/Cake/Test/Case/Cache/CacheTest.php +++ b/lib/Cake/Test/Case/Cache/CacheTest.php @@ -88,7 +88,7 @@ class CacheTest extends CakeTestCase { App::build(array( 'Lib' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS), 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); $settings = array('engine' => 'TestAppCache', 'path' => TMP, 'prefix' => 'cake_test_'); @@ -260,7 +260,7 @@ class CacheTest extends CakeTestCase { App::build(array( 'libs' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS), 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); $result = Cache::drop('some_config_that_does_not_exist'); $this->assertFalse($result); @@ -312,7 +312,7 @@ class CacheTest extends CakeTestCase { App::build(array( 'libs' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS), 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); Cache::config('test_trigger', array('engine' => 'TestAppCache', 'prefix' => '')); try { diff --git a/lib/Cake/Test/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php index 2f24456c1..259f029b5 100644 --- a/lib/Cake/Test/Case/Configure/PhpReaderTest.php +++ b/lib/Cake/Test/Case/Configure/PhpReaderTest.php @@ -85,7 +85,7 @@ class PhpReaderTest extends CakeTestCase { public function testReadPluginValue() { App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); $reader = new PhpReader($this->path); $result = $reader->read('TestPlugin.load'); diff --git a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php index 688f3655e..540711c78 100644 --- a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php @@ -46,7 +46,7 @@ class CommandListShellTest extends CakeTestCase { 'Console/Command' => array( CAKE . 'Test' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS ) - ), true); + ), App::RESET); CakePlugin::load(array('TestPlugin', 'TestPluginTwo')); $out = new TestStringOutput(); diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php index c8c2572d7..abd9ed0dd 100644 --- a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php @@ -336,7 +336,7 @@ class SchemaShellTest extends CakeTestCase { public function testGenerateWithPlugins() { App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); $this->db->cacheSources = false; diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php index 5f20fd9f2..ec2d1ac24 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php @@ -573,7 +573,7 @@ class TestTaskTest extends CakeTestCase { $testApp = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS; App::build(array( 'plugins' => array($testApp) - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); $this->Task->plugin = 'TestPlugin'; diff --git a/lib/Cake/Test/Case/Console/ShellDispatcherTest.php b/lib/Cake/Test/Case/Console/ShellDispatcherTest.php index bbc7ba55c..dfe27a464 100644 --- a/lib/Cake/Test/Case/Console/ShellDispatcherTest.php +++ b/lib/Cake/Test/Case/Console/ShellDispatcherTest.php @@ -119,7 +119,7 @@ class ShellDispatcherTest extends CakeTestCase { 'Console/Command' => array( CAKE . 'Test' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS ) - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); } diff --git a/lib/Cake/Test/Case/Console/ShellTest.php b/lib/Cake/Test/Case/Console/ShellTest.php index b51cdeb37..b033f1d23 100644 --- a/lib/Cake/Test/Case/Console/ShellTest.php +++ b/lib/Cake/Test/Case/Console/ShellTest.php @@ -173,7 +173,7 @@ class ShellTest extends CakeTestCase { App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS), 'models' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS) - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); $this->Shell->uses = array('TestPlugin.TestPluginPost'); diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php index bc937ccbd..261bd9235 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticateTest.php @@ -160,7 +160,7 @@ class FormAuthenticateTest extends CakeTestCase { Cache::delete('object_map', '_cake_core_'); App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS), - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); $ts = date('Y-m-d H:i:s'); diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php index afc3f3d4c..380062ab8 100644 --- a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php @@ -712,7 +712,7 @@ class RequestHandlerComponentTest extends CakeTestCase { public function testAjaxRedirectAsRequestAction() { App::build(array( 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS) - ), true); + ), App::RESET); $this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components)); $this->Controller->request = $this->getMock('CakeRequest'); @@ -741,7 +741,7 @@ class RequestHandlerComponentTest extends CakeTestCase { public function testAjaxRedirectAsRequestActionStillRenderingLayout() { App::build(array( 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS) - ), true); + ), App::RESET); $this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components)); $this->Controller->request = $this->getMock('CakeRequest'); diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php index 2810f7c68..373069087 100644 --- a/lib/Cake/Test/Case/Controller/ControllerTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerTest.php @@ -624,7 +624,7 @@ class ControllerTest extends CakeTestCase { public function testRender() { App::build(array( 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS) - ), true); + ), App::RESET); ClassRegistry::flush(); $request = new CakeRequest('controller_posts/index'); $request->params['action'] = 'index'; diff --git a/lib/Cake/Test/Case/Core/CakePluginTest.php b/lib/Cake/Test/Case/Core/CakePluginTest.php index 84600942c..c8c669242 100644 --- a/lib/Cake/Test/Case/Core/CakePluginTest.php +++ b/lib/Cake/Test/Case/Core/CakePluginTest.php @@ -33,7 +33,7 @@ class CakePluginTest extends CakeTestCase { public function setUp() { App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); App::objects('plugins', null, false); } diff --git a/lib/Cake/Test/Case/Core/ConfigureTest.php b/lib/Cake/Test/Case/Core/ConfigureTest.php index 5e94b5749..4568ff29f 100644 --- a/lib/Cake/Test/Case/Core/ConfigureTest.php +++ b/lib/Cake/Test/Case/Core/ConfigureTest.php @@ -255,7 +255,9 @@ class ConfigureTest extends CakeTestCase { * @return void */ public function testLoadPlugin() { - App::build(array('plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)), true); + App::build(array( + 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) + ), App::RESET); Configure::config('test', new PhpReader()); CakePlugin::load('TestPlugin'); $result = Configure::load('TestPlugin.load', 'test'); diff --git a/lib/Cake/Test/Case/Core/ObjectTest.php b/lib/Cake/Test/Case/Core/ObjectTest.php index 3521b9927..1e4298739 100644 --- a/lib/Cake/Test/Case/Core/ObjectTest.php +++ b/lib/Cake/Test/Case/Core/ObjectTest.php @@ -449,7 +449,7 @@ class ObjectTest extends CakeTestCase { '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) - ), true); + ), App::RESET); $this->assertNull(Router::getRequest(), 'request stack should be empty.'); $result = $this->object->requestAction(''); @@ -489,7 +489,7 @@ class ObjectTest extends CakeTestCase { public function testRequestActionPlugins() { App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS), - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); Router::reload(); @@ -529,7 +529,7 @@ class ObjectTest extends CakeTestCase { '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) - ), true); + ), App::RESET); CakePlugin::load(array('TestPlugin')); $result = $this->object->requestAction( diff --git a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php index d80ff3f28..3d6886ef9 100644 --- a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php +++ b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php @@ -41,7 +41,7 @@ class ErrorHandlerTest extends CakeTestCase { 'View' => array( CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS ) - ), true); + ), App::RESET); Router::reload(); $request = new CakeRequest(null, false); @@ -232,7 +232,7 @@ class ErrorHandlerTest extends CakeTestCase { 'plugins' => array( CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS ) - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); Configure::write('Exception.renderer', 'TestPlugin.TestPluginExceptionRenderer'); $error = new NotFoundException('Kaboom!'); diff --git a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php index 696ffd333..48f3ee87b 100644 --- a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php +++ b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php @@ -155,7 +155,7 @@ class ExceptionRendererTest extends CakeTestCase { 'views' => array( CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS ) - ), true); + ), App::RESET); Router::reload(); $request = new CakeRequest(null, false); diff --git a/lib/Cake/Test/Case/I18n/I18nTest.php b/lib/Cake/Test/Case/I18n/I18nTest.php index f2a94b637..36c82998d 100644 --- a/lib/Cake/Test/Case/I18n/I18nTest.php +++ b/lib/Cake/Test/Case/I18n/I18nTest.php @@ -35,7 +35,7 @@ class I18nTest extends CakeTestCase { App::build(array( 'locales' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS), 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); CakePlugin::load(array('TestPlugin')); } diff --git a/lib/Cake/Test/Case/Log/CakeLogTest.php b/lib/Cake/Test/Case/Log/CakeLogTest.php index 24e380a83..4e283db00 100644 --- a/lib/Cake/Test/Case/Log/CakeLogTest.php +++ b/lib/Cake/Test/Case/Log/CakeLogTest.php @@ -49,7 +49,7 @@ class CakeLogTest extends CakeTestCase { App::build(array( 'libs' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Lib' . DS), 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); $result = CakeLog::config('libtest', array( diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php index 6783be159..7d4a1e0dc 100644 --- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php @@ -504,7 +504,7 @@ class CakeSessionTest extends CakeTestCase { CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS ), 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); Configure::write('Session', array( 'defaults' => 'cake', 'handler' => array( @@ -525,7 +525,7 @@ class CakeSessionTest extends CakeTestCase { public function testUsingPluginHandler() { App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); CakePlugin::load('TestPlugin'); Configure::write('Session', array( diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php index 8e1933364..1224180aa 100644 --- a/lib/Cake/Test/Case/Routing/DispatcherTest.php +++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php @@ -1038,7 +1038,7 @@ class DispatcherTest extends CakeTestCase { Router::reload(); App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), true); + ), App::RESET); CakePlugin::load(array('TestPlugin', 'TestPluginTwo')); $Dispatcher = new TestDispatcher(); @@ -1114,7 +1114,7 @@ class DispatcherTest extends CakeTestCase { $Dispatcher = new TestDispatcher(); App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - ), APP::RESET); + ), App::RESET); CakePlugin::load(array('TestPlugin', 'TestPluginTwo')); Router::reload(); Router::parse('/'); @@ -1396,7 +1396,7 @@ class DispatcherTest extends CakeTestCase { App::build(array( 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS), - ), true); + ), App::RESET); $dispatcher = new TestDispatcher(); $request = new CakeRequest($url); diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php index c9459cc97..32831580b 100644 --- a/lib/Cake/Test/Case/Routing/RouterTest.php +++ b/lib/Cake/Test/Case/Routing/RouterTest.php @@ -1187,7 +1187,7 @@ class RouterTest extends CakeTestCase { 'plugins' => array( CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS ) - ), true); + ), App::RESET); CakePlugin::load(array('TestPlugin')); Router::reload(); @@ -2201,7 +2201,7 @@ class RouterTest extends CakeTestCase { 'plugins' => array( CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS ) - ), true); + ), App::RESET); CakePlugin::load(array('TestPlugin', 'PluginJs')); Router::reload(); require CAKE . 'Config' . DS . 'routes.php'; diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php index 8e3b1c448..92b39991f 100644 --- a/lib/Cake/Test/Case/Utility/CakeTimeTest.php +++ b/lib/Cake/Test/Case/Utility/CakeTimeTest.php @@ -656,7 +656,7 @@ class CakeTimeTest extends CakeTestCase { public function testConvertSpecifiers() { App::build(array( 'locales' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS) - ), true); + ), App::RESET); Configure::write('Config.language', 'time_test'); $time = strtotime('Thu Jan 14 11:43:39 2010'); @@ -763,7 +763,7 @@ class CakeTimeTest extends CakeTestCase { public function testI18nFormat() { App::build(array( 'locales' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS) - ), true); + ), App::RESET); Configure::write('Config.language', 'time_test'); $time = strtotime('Thu Jan 14 13:59:28 2010'); diff --git a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php index 8205df882..fe0999f19 100644 --- a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php @@ -85,7 +85,7 @@ class CacheHelperTest extends CakeTestCase { Configure::write('Cache.disable', false); App::build(array( 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS) - ), true); + ), App::RESET); } /** diff --git a/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php b/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php index 076129537..5b2cba335 100644 --- a/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php @@ -92,13 +92,13 @@ class NumberHelperTest extends CakeTestCase { public function testEngineOverride() { App::build(array( 'Utility' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Utility' . DS) - ), APP::REGISTER); + ), App::REGISTER); $Number = new NumberHelperTestObject($this->View, array('engine' => 'TestAppEngine')); $this->assertInstanceOf('TestAppEngine', $Number->engine()); App::build(array( 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - )); + )); CakePlugin::load('TestPlugin'); $Number = new NumberHelperTestObject($this->View, array('engine' => 'TestPlugin.TestPluginEngine')); $this->assertInstanceOf('TestPluginEngine', $Number->engine()); diff --git a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php index 5e207a4b9..c3e9acec4 100644 --- a/lib/Cake/Test/Case/View/Helper/TextHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php @@ -88,13 +88,13 @@ class TextHelperTest extends CakeTestCase { public function testEngineOverride() { App::build(array( 'Utility' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Utility' . DS) - ), APP::REGISTER); + ), App::REGISTER); $Text = new TextHelperTestObject($this->View, array('engine' => 'TestAppEngine')); $this->assertInstanceOf('TestAppEngine', $Text->engine()); App::build(array( 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - )); + )); CakePlugin::load('TestPlugin'); $Text = new TextHelperTestObject($this->View, array('engine' => 'TestPlugin.TestPluginEngine')); $this->assertInstanceOf('TestPluginEngine', $Text->engine()); diff --git a/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php b/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php index 7f1987930..d1df2e349 100644 --- a/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php @@ -98,13 +98,13 @@ class TimeHelperTest extends CakeTestCase { public function testEngineOverride() { App::build(array( 'Utility' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Utility' . DS) - ), APP::REGISTER); + ), App::REGISTER); $Time = new TimeHelperTestObject($this->View, array('engine' => 'TestAppEngine')); $this->assertInstanceOf('TestAppEngine', $Time->engine()); App::build(array( 'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) - )); + )); CakePlugin::load('TestPlugin'); $Time = new TimeHelperTestObject($this->View, array('engine' => 'TestPlugin.TestPluginEngine')); $this->assertInstanceOf('TestPluginEngine', $Time->engine()); diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php index a286e8097..eb6add052 100644 --- a/lib/Cake/Test/Case/View/ViewTest.php +++ b/lib/Cake/Test/Case/View/ViewTest.php @@ -271,7 +271,7 @@ class ViewTest extends CakeTestCase { App::build(array( 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS), 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS) - ), true); + ), App::RESET); App::objects('plugins', null, false); CakePlugin::load(array('TestPlugin', 'TestPlugin', 'PluginJs'));