From b56931383cb7976ed9d6464df299bd96d3269536 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 10 Jul 2011 11:02:16 -0400
Subject: [PATCH] Adding tests.

---
 .../Test/Case/Controller/ControllerTest.php   | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php
index d917f5af3..ad1f5a3d1 100644
--- a/lib/Cake/Test/Case/Controller/ControllerTest.php
+++ b/lib/Cake/Test/Case/Controller/ControllerTest.php
@@ -295,6 +295,10 @@ class TestController extends ControllerTestAppController {
 			'test2Id' => $test2Id
 		);
 	}
+
+	public function returner() {
+		return 'I am from the controller.';
+	}
 	
 	protected function protected_m() {
 	
@@ -319,7 +323,6 @@ class TestController extends ControllerTestAppController {
  * @package       cake.tests.cases.libs.controller
  */
 class TestComponent extends Object {
-
 /**
  * beforeRedirect method
  *
@@ -1374,4 +1377,25 @@ class ControllerTest extends CakeTestCase {
 		$Controller = new TestController($url, $response);
 		$Controller->invokeAction($url);
 	}
+
+/**
+ * test invoking controller methods.
+ *
+ * @return void
+ */
+	public function testInvokeActionReturnValue() {
+		$url = new CakeRequest('test/returner/');
+		$url->addParams(array(
+			'controller' => 'test_controller',
+			'action' => 'returner',
+			'pass' => array()
+		));
+		$response = $this->getMock('CakeResponse');
+
+		$Controller = new TestController($url, $response);
+		$result = $Controller->invokeAction($url);
+		$this->assertEquals('I am from the controller.', $result);
+	}
+
+	
 }