adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.7' of github.com:cakephp/cakephp into 2.7

Browse source 
Conflicts:
	lib/Cake/TestSuite/ControllerTestCase.php
This commit is contained in:
mark_story 2014-12-23 11:30:29 -05:00
commit eba6105a52
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
View file

@ -299,6 +299,17 @@ class ControllerTestCaseTest extends CakeTestCase {
$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.
*

6
lib/Cake/TestSuite/ControllerTestCase.php
View file

@ -210,7 +210,7 @@ abstract class ControllerTestCase extends CakeTestCase {
* - `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)
@ -224,6 +224,10 @@ abstract class ControllerTestCase extends CakeTestCase {
'return' => 'result'
);
if (is_array($url)) {
$url = Router::url($url);
}
$restore = array('get' => $_GET, 'post' => $_POST);
$_SERVER['REQUEST_METHOD'] = strtoupper($options['method']);