Merge pull request #7599 from kenjis/fix-TestResponseTest

test: fix TestResponseTest

Author: kenjis

system/Format/FormatterInterface.php

@@ -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
      */

system/HTTP/ResponseTrait.php

@@ -239,7 +239,7 @@ public function setContentType(string $mime, string $charset = 'UTF-8')
     /**
      * 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 @@ public function getXML()
      * 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
      *

tests/system/Test/FeatureTestTraitTest.php

@@ -372,20 +372,6 @@ public function testCallWithJsonRequest()
         $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');

tests/system/Test/TestResponseTest.php

@@ -299,13 +299,15 @@ public function testAssertCookieExpired()
 
     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 @@ public function testEmptyJSON()
         $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 @@ public function testFalseJSON()
         $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 @@ public function testTrueJSON()
         $this->assertSame('true', $this->testResponse->getJSON());
     }
 
-    public function testInvalidJSON()
+    public function testGetJSONInvalidJSON()
     {
         $tmp = ' test " case ';
         $this->getTestResponse('<h1>Hello World</h1>');
@@ -344,30 +346,36 @@ public function testInvalidJSON()
 
     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);
     }
 
     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,36 +391,50 @@ public function testAssertJSONFragmentFailsGracefullyWhenNotGivenJson()
         $this->testResponse->assertJSONFragment(['foo' => 'bar']);
     }
 
-    public function testJsonExact()
+    public function testAssertJsonExactArray()
     {
         $data = [
             'config' => [
                 'key-a',
                 'key-b',
             ],
         ];
+        $this->getTestResponse('');
+        $this->response->setJSON($data, true);
+
+        $this->testResponse->assertJSONExact($data);
+    }
 
-        $this->getTestResponse($data);
+    public function testAssertJsonExactObject()
+    {
+        $data = (object) [
+            'config' => [
+                'key-a',
+                'key-b',
+            ],
+        ];
+        $this->getTestResponse('');
+        $this->response->setJSON($data, true);
 
         $this->testResponse->assertJSONExact($data);
     }
 
-    public function testJsonExactString()
+    public function testAssertJsonExactString()
     {
         $data = [
             'config' => [
                 'key-a',
                 '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);