Fixing scaffold test so all_controllers suite runs in cli.

cakephp · Sep 25, 2010 · c9a6eba · c9a6eba
1 parent d6b747c
commit c9a6eba
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php
@@ -283,6 +283,7 @@ class ScaffoldViewTest extends CakeTestCase {
 	function startTest() {
 		$this->request = new CakeRequest(null, false);
 		$this->Controller = new ScaffoldMockController($this->request);
+		$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
 
 		App::build(array(
 			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
@@ -694,6 +695,7 @@ class ScaffoldTest extends CakeTestCase {
 	function startTest() {
 		$request = new CakeRequest(null, false);
 		$this->Controller = new ScaffoldMockController($request);
+		$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
 	}
 
 /**
@@ -776,9 +778,6 @@ function testScaffoldVariableSetting() {
 		$this->assertEqual($result['pluralVar'], 'scaffoldMock');
 		$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated'));
 	}
-	function getTests() {
-		return array('start', 'startCase', 'testScaffoldChangingViewProperty', 'endCase', 'end');
-	}
 
 /**
  * test that Scaffold overrides the view property even if its set to 'Theme'
@@ -875,6 +874,8 @@ function testHabtmFieldAdditionWithScaffoldForm() {
 	function testEditScaffoldWithScaffoldFields() {
 		$request = new CakeRequest(null, false);
 		$this->Controller = new ScaffoldMockControllerWithFields($request);
+		$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
+
 		$params = array(
 			'plugin' => null,
 			'pass' => array(1),