Updating test cases with failing tests.

cakephp · Nov 16, 2010 · f0ac462 · f0ac462
1 parent 66e6ec7
commit f0ac462
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/cake/tests/cases/libs/controller/component_collection.test.php b/cake/tests/cases/libs/controller/component_collection.test.php
@@ -65,7 +65,7 @@ function testLoad() {
  * @return void
  */
 	function testLoadWithEnableFalse() {
-		$result = $this->Components->load('Cookie', array('callbacks' => false));
+		$result = $this->Components->load('Cookie', array('enabled' => false));
 		$this->assertType('CookieComponent', $result);
 		$this->assertType('CookieComponent', $this->Components->Cookie);
 

diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -1451,17 +1451,18 @@ function testPluginModel() {
  * @return void
  */
 	function testAjaxLogin() {
-		App::build(array('views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)));
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
 		$_SERVER['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest";
 
-		if (!class_exists('dispatcher')) {
-			require CAKE . 'dispatcher.php';
-		}
+		App::import('Core', 'Dispatcher');
 
 		ob_start();
 		$Dispatcher = new Dispatcher();
-		$Dispatcher->dispatch('/ajax_auth/add', array('return' => 1));
+		$Dispatcher->dispatch(new CakeRequest('/ajax_auth/add'), array('return' => 1));
 		$result = ob_get_clean();
+
 		$this->assertEqual("Ajax!\nthis is the test element", str_replace("\r\n", "\n", $result));
 		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
 	}

diff --git a/cake/tests/cases/libs/debugger.test.php b/cake/tests/cases/libs/debugger.test.php
@@ -243,7 +243,8 @@ function testExportVar() {
 		View::$modelId = NULL
 		View::$uuids = array
 		View::$output = false
-		View::$request = NULL';
+		View::$request = NULL
+		View::$elementCache = "default"';
 		$result = str_replace(array("\t", "\r\n", "\n"), "", strtolower($result));
 		$expected =  str_replace(array("\t", "\r\n", "\n"), "", strtolower($expected));
 		$this->assertEqual($result, $expected);

diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/cake/tests/cases/libs/view/helpers/rss.test.php
@@ -36,6 +36,7 @@ class RssHelperTest extends CakeTestCase {
  */
 	function setUp() {
 		parent::setUp();
+		$controller = null;
 		$this->View = new View($controller);
 		$this->Rss = new RssHelper($this->View);
 	}