adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10557 from ndm2/2.x-fix-controller-test-case-base-incompatibility

Browse source 
2.x - Fix query string data in URL arrays not being passed anymore (#10517 follow-up)
This commit is contained in:
Mark Story 2017-04-18 20:01:38 -04:00 committed by GitHub
commit eb937e3c79
2 changed files with 84 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -650,4 +650,81 @@ class ControllerTestCaseTest extends CakeTestCase {
);
$this->assertEquals($expected, array_intersect_key($this->Case->controller->request->params, $expected));
}
/**
* Tests that query string data from URL arrays properly makes it into the request object
* on GET requests.
*
* @return void
*/
public function testTestActionWithArrayUrlQueryStringDataViaGetRequest() {
$query = array('foo' => 'bar');
$this->Case->generate('TestsApps');
$this->Case->testAction(
array(
'controller' => 'tests_apps',
'action' => 'index',
'?' => $query
),
array(
'method' => 'get'
)
);
$this->assertEquals('tests_apps', $this->Case->controller->request->url);
$this->assertEquals($query, $this->Case->controller->request->query);
}
/**
* Tests that query string data from URL arrays properly makes it into the request object
* on POST requests.
*
* @return void
*/
public function testTestActionWithArrayUrlQueryStringDataViaPostRequest() {
$query = array('foo' => 'bar');
$this->Case->generate('TestsApps');
$this->Case->testAction(
array(
'controller' => 'tests_apps',
'action' => 'index',
'?' => $query
),
array(
'method' => 'post'
)
);
$this->assertEquals('tests_apps', $this->Case->controller->request->url);
$this->assertEquals($query, $this->Case->controller->request->query);
}
/**
* Tests that query string data from both, URL arrays as well as the `data` option,
* properly makes it into the request object.
*
* @return void
*/
public function testTestActionWithArrayUrlQueryStringDataAndDataOptionViaGetRequest() {
$query = array('foo' => 'bar');
$data = array('bar' => 'foo');
$this->Case->generate('TestsApps');
$this->Case->testAction(
array(
'controller' => 'tests_apps',
'action' => 'index',
'?' => $query
),
array(
'method' => 'get',
'data' => $data
)
);
$this->assertEquals('tests_apps', $this->Case->controller->request->url);
$this->assertEquals($data + $query, $this->Case->controller->request->query);
}
}

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

@ -248,6 +248,13 @@ abstract class ControllerTestCase extends CakeTestCase {
$_GET = array();
}
}
if (strpos($url, '?') !== false) {
list($url, $query) = explode('?', $url, 2);
parse_str($query, $queryArgs);
$_GET += $queryArgs;
}
$_SERVER['REQUEST_URI'] = $url;
$request = $this->getMock('CakeRequest', array('_readInput'));