Controller: Updated the set method so that data can be overwritten wh…

…en set again. ControllerTest: Added tests for the set method.
gwoo · Jun 4, 2011 · 5c4f147 · 5c4f147
1 parent 3870c61
commit 5c4f147
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/libraries/lithium/action/Controller.php b/libraries/lithium/action/Controller.php
@@ -202,7 +202,7 @@ public function __invoke($request, $dispatchParams, array $options = array()) {
 	 * @return void
 	 */
 	public function set($data = array()) {
-		$this->_render['data'] += (array) $data;
+		$this->_render['data'] = (array) $data + $this->_render['data'];
 	}
 
 	/**

diff --git a/libraries/lithium/tests/cases/action/ControllerTest.php b/libraries/lithium/tests/cases/action/ControllerTest.php
@@ -285,6 +285,24 @@ public function testManuallySettingTemplate() {
 		$this->assertEqual('foo', $result['template']);
 	}
 
+	public function testSetData() {
+		$postController = new MockPostsController();
+
+		$setData = array('foo' => 'bar');
+		$postController->set($setData);
+		$_render = $postController->access('_render');
+		$data = $_render['data'];
+		$expected = $setData;
+		$this->assertEqual($expected, $data);
+
+		$setData = array('foo' => 'baz');
+		$postController->set($setData);
+		$_render = $postController->access('_render');
+		$data = $_render['data'];
+		$expected = $setData;
+		$this->assertEqual($expected, $data);
+	}
+
 	public function testResponseTypeBasedOnRequestHeaderType() {
 		$request = new MockControllerRequest(array(
 			'env' => array('HTTP_ACCEPT' => 'application/json,*/*')