Fixing failing tests in ObjectTest.

cakephp · Apr 22, 2011 · fd55066 · fd55066
1 parent dbb3149
commit fd55066
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/lib/Cake/tests/Case/Core/ObjectTest.php b/lib/Cake/tests/Case/Core/ObjectTest.php
@@ -683,9 +683,9 @@ function testMethodDispatching() {
  */
 	function testRequestAction() {
 		App::build(array(
-			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS),
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS),
-			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
+			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
+			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
+			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS)
 		));
 		$result = $this->object->requestAction('');
 		$this->assertFalse($result);
@@ -763,9 +763,9 @@ function testRequestActionPlugins() {
  */
 	function testRequestActionArray() {
 		App::build(array(
-			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS),
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS),
-			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
+			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
+			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
+			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS)
 		));
 
 		$result = $this->object->requestAction(
@@ -819,8 +819,7 @@ function testRequestActionArray() {
  */
 	function testRequestActionParamParseAndPass() {
 		$result = $this->object->requestAction('/request_action/params_pass');
-		$this->assertTrue(isset($result['url']['url']));
-		$this->assertEqual($result['url']['url'], 'request_action/params_pass');
+		$this->assertEqual($result->url, 'request_action/params_pass');
 		$this->assertEqual($result['controller'], 'request_action');
 		$this->assertEqual($result['action'], 'params_pass');
 		$this->assertEqual($result['form'], array());