removing unneeded App::build() calls in the tests, tearDown() already…

… does this, also always build with App::RESET
cakephp · May 24, 2011 · 76b3f5a · 76b3f5a
1 parent 14b065e
commit 76b3f5a
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/lib/Cake/Test/Case/Core/ObjectTest.php b/lib/Cake/Test/Case/Core/ObjectTest.php
@@ -679,7 +679,7 @@ function testRequestAction() {
 			'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);
 		$result = $this->object->requestAction('');
 		$this->assertFalse($result);
 
@@ -705,8 +705,6 @@ function testRequestAction() {
 		$result = $this->object->requestAction('/request_action/normal_request_action');
 		$expected = 'Hello World';
 		$this->assertEqual($expected, $result);
-
-		App::build();
 	}
 
 /**
@@ -717,7 +715,7 @@ function testRequestAction() {
 	function testRequestActionPlugins() {
 		App::build(array(
 			'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-		));
+		), true);
 		CakePlugin::loadAll();
 		Router::reload();
 
@@ -744,9 +742,6 @@ function testRequestActionPlugins() {
 		);
 		$expected = 25;
 		$this->assertEqual($expected, $result);
-
-		App::build();
-		CakePlugin::unload();
 	}
 
 /**
@@ -760,7 +755,7 @@ function testRequestActionArray() {
 			'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);
 		CakePlugin::loadAll();
 
 		$result = $this->object->requestAction(
@@ -802,8 +797,6 @@ function testRequestActionArray() {
 			array('pass' => array(5), 'named' => array('param' => 'value'))
 		);
 		$this->assertTrue($result);
-
-		App::build();
 	}
 
 /**