Skip to content

fix: populateGlobals for JSON and XML body format #9211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix: populateGlobals for JSON and XML body format #9211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions system/Test/FeatureTestTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,11 +375,11 @@ protected function populateGlobals(string $name, Request $request, ?array $param

$request->setGlobal('get', $get);

if ($name === 'get') {
if ($name === 'get' || ($name === 'post' && in_array($this->bodyFormat, ['json', 'xml'], true))) {
$request->setGlobal('request', $request->fetchGlobal('get'));
}

if ($name === 'post') {
if ($name === 'post' && ! in_array($this->bodyFormat, ['json', 'xml'], true)) {
$request->setGlobal($name, $params);
$request->setGlobal(
'request',
Expand Down
22 changes: 21 additions & 1 deletion tests/system/Test/FeatureTestTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public function testCallPutWithJsonRequestAndREQUEST(): void
$this->assertStringContainsString('[]', $response->getBody());
}

public function testCallWithJsonRequest(): void
public function testCallWithAssociativeJsonRequest(): void
{
$this->withRoutes([
[
Expand All @@ -581,6 +581,26 @@ public function testCallWithJsonRequest(): void
$response->assertJSONExact($data);
}

public function testCallWithListJsonRequest(): void
{
$this->withRoutes([
[
'POST',
'home',
'\Tests\Support\Controllers\Popcorn::echoJson',
],
]);
$data = [
['one' => 1, 'two' => 2],
['one' => 2, 'two' => 2],
];
$response = $this->withBodyFormat('json')
->call(Method::POST, 'home', $data);

$response->assertOK();
$response->assertJSONExact($data);
}

public function testSetupRequestBodyWithParams(): void
{
$request = $this->setupRequest('post', 'home');
Expand Down
Loading