Merge pull request #5474 from cakephp/master-testsuite

Correct argument. Should not have a default string.
This commit is contained in:
Mark Story 2014-12-23 09:50:18 -05:00
commit 8382ecb689

View file

@ -210,12 +210,12 @@ abstract class ControllerTestCase extends CakeTestCase {
* - `result` Get the return value of the controller action. Useful * - `result` Get the return value of the controller action. Useful
* for testing requestAction methods. * for testing requestAction methods.
* *
* @param string $url The url to test * @param string $url The URL to test
* @param array $options See options * @param array $options See options
* @return mixed The specified return type. * @return mixed The specified return type.
* @triggers ControllerTestCase $Dispatch, array('request' => $request) * @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; $this->vars = $this->result = $this->view = $this->contents = $this->headers = null;
$options += array( $options += array(