Backport array support for testAction()

cakephp · Dec 23, 2014 · 53f1390 · 53f1390
1 parent 6db96d5
commit 53f1390
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
@@ -299,6 +299,17 @@ public function testTestAction() {
 		$this->assertEquals($expected, $results);
 	}
 
+/**
+ * Test array URLs with testAction()
+ *
+ * @return void
+ */
+	public function testTestActionArrayUrls() {
+		$Controller = $this->Case->generate('TestsApps');
+		$this->Case->testAction(array('controller' => 'tests_apps', 'action' => 'index'));
+		$this->assertInternalType('array', $this->Case->controller->viewVars);
+	}
+
 /**
  * Make sure testAction() can hit plugin controllers.
  *

diff --git a/lib/Cake/TestSuite/ControllerTestCase.php b/lib/Cake/TestSuite/ControllerTestCase.php
@@ -210,12 +210,12 @@ public function __call($name, $arguments) {
  *     - `result` Get the return value of the controller action. Useful
  *       for testing requestAction methods.
  *
- * @param string $url The url to test
+ * @param string|array $url The url to test
  * @param array $options See options
  * @return mixed The specified return type.
  * @triggers ControllerTestCase $Dispatch, array('request' => $request)
  */
-	protected function _testAction($url = '', $options = array()) {
+	protected function _testAction($url, $options = array()) {
 		$this->vars = $this->result = $this->view = $this->contents = $this->headers = null;
 
 		$options += array(
@@ -224,6 +224,10 @@ protected function _testAction($url = '', $options = array()) {
 			'return' => 'result'
 		);
 
+		if (is_array($url)) {
+			$url = Router::url($url);
+		}
+
 		$restore = array('get' => $_GET, 'post' => $_POST);
 
 		$_SERVER['REQUEST_METHOD'] = strtoupper($options['method']);