malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7599 from kenjis/fix-TestResponseTest

Browse Source 
test: fix TestResponseTest
This commit is contained in:
kenjis 2023-07-04 08:03:34 +09:00 committed by GitHub
commit da41b55ff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/Format/FormatterInterface.php
View File

@ -19,7 +19,7 @@ interface FormatterInterface
/**
* Takes the given data and formats it.
*
* @param array|string $data
* @param array|object|string $data
*
* @return false|string
*/

6
system/HTTP/ResponseTrait.php
View File

@ -239,7 +239,7 @@ trait ResponseTrait
/**
* Converts the $body into JSON and sets the Content Type header.
*
* @param array|string $body
* @param array|object|string $body
*
* @return $this
*/
@ -304,8 +304,8 @@ trait ResponseTrait
* Handles conversion of the data into the appropriate format,
* and sets the correct Content-Type header for our response.
*
* @param array|string $body
* @param string $format Valid: json, xml
* @param array|object|string $body
* @param string $format Valid: json, xml
*
* @return mixed
*

14
tests/system/Test/FeatureTestTraitTest.php
View File

@ -372,20 +372,6 @@ final class FeatureTestTraitTest extends CIUnitTestCase
$response->assertJSONExact(['foo' => 'bar']);
}
public function testCallWithJsonRequestObject()
{
$this->withRoutes([
[
'post',
'home',
'\Tests\Support\Controllers\Popcorn::echoJson',
],
]);
$response = $this->withBodyFormat('json')->call('post', 'home', ['foo' => 'bar']);
$response->assertOK();
$response->assertJSONExact((object) ['foo' => 'bar']);
}
public function testSetupRequestBodyWithParams()
{
$request = $this->setupRequest('post', 'home');

66
tests/system/Test/TestResponseTest.php
View File

@ -299,13 +299,15 @@ final class TestResponseTest extends CIUnitTestCase
public function testGetJSON()
{
$this->getTestResponse(['foo' => 'bar']);
$formatter = Services::format()->getFormatter('application/json');
$data = ['foo' => 'bar'];
$this->getTestResponse('');
$this->response->setJSON($data, true);
$this->assertSame($formatter->format(['foo' => 'bar']), $this->testResponse->getJSON());
$formatter = Services::format()->getFormatter('application/json');
$this->assertSame($formatter->format($data), $this->testResponse->getJSON());
}
public function testEmptyJSON()
public function testGetJSONEmptyJSON()
{
$this->getTestResponse('<h1>Hello World</h1>');
$this->response->setJSON('', true);
@ -314,7 +316,7 @@ final class TestResponseTest extends CIUnitTestCase
$this->assertSame('""', $this->testResponse->getJSON());
}
public function testFalseJSON()
public function testGetJSONFalseJSON()
{
$this->getTestResponse('<h1>Hello World</h1>');
$this->response->setJSON(false, true);
@ -323,7 +325,7 @@ final class TestResponseTest extends CIUnitTestCase
$this->assertSame('false', $this->testResponse->getJSON());
}
public function testTrueJSON()
public function testGetJSONTrueJSON()
{
$this->getTestResponse('<h1>Hello World</h1>');
$this->response->setJSON(true, true);
@ -332,7 +334,7 @@ final class TestResponseTest extends CIUnitTestCase
$this->assertSame('true', $this->testResponse->getJSON());
}
public function testInvalidJSON()
public function testGetJSONInvalidJSON()
{
$tmp = ' test " case ';
$this->getTestResponse('<h1>Hello World</h1>');
@ -344,20 +346,24 @@ final class TestResponseTest extends CIUnitTestCase
public function testGetXML()
{
$this->getTestResponse(['foo' => 'bar']);
$formatter = Services::format()->getFormatter('application/xml');
$data = ['foo' => 'bar'];
$this->getTestResponse('');
$this->response->setXML($data);
$this->assertSame($formatter->format(['foo' => 'bar']), $this->testResponse->getXML());
$formatter = Services::format()->getFormatter('application/xml');
$this->assertSame($formatter->format($data), $this->testResponse->getXML());
}
public function testJsonFragment()
public function testAssertJSONFragment()
{
$this->getTestResponse([
$data = [
'config' => [
'key-a',
'key-b',
],
]);
];
$this->getTestResponse('');
$this->response->setJSON($data, true);
$this->testResponse->assertJSONFragment(['config' => ['key-a']]);
$this->testResponse->assertJSONFragment(['config' => ['key-a']], true);
@ -365,9 +371,11 @@ final class TestResponseTest extends CIUnitTestCase
public function testAssertJSONFragmentFollowingAssertArraySubset()
{
$this->getTestResponse([
$data = [
'config' => '124',
]);
];
$this->getTestResponse('');
$this->response->setJSON($data, true);
$this->testResponse->assertJSONFragment(['config' => 124]); // must fail on strict
$this->testResponse->assertJSONFragment(['config' => '124'], true);
@ -383,7 +391,7 @@ final class TestResponseTest extends CIUnitTestCase
$this->testResponse->assertJSONFragment(['foo' => 'bar']);
}
public function testJsonExact()
public function testAssertJsonExactArray()
{
$data = [
'config' => [
@ -391,13 +399,27 @@ final class TestResponseTest extends CIUnitTestCase
'key-b',
],
];
$this->getTestResponse($data);
$this->getTestResponse('');
$this->response->setJSON($data, true);
$this->testResponse->assertJSONExact($data);
}
public function testJsonExactString()
public function testAssertJsonExactObject()
{
$data = (object) [
'config' => [
'key-a',
'key-b',
],
];
$this->getTestResponse('');
$this->response->setJSON($data, true);
$this->testResponse->assertJSONExact($data);
}
public function testAssertJsonExactString()
{
$data = [
'config' => [
@ -405,14 +427,14 @@ final class TestResponseTest extends CIUnitTestCase
'key-b',
],
];
$this->getTestResponse('');
$this->response->setJSON($data, true);
$this->getTestResponse($data);
$formatter = Services::format()->getFormatter('application/json');
$this->testResponse->assertJSONExact($formatter->format($data));
}
protected function getTestResponse($body = null, array $responseOptions = [], array $headers = [])
protected function getTestResponse(?string $body = null, array $responseOptions = [], array $headers = [])
{
$this->response = new Response(new App());
$this->response->setBody($body);