Merge pull request #38 from kbond/assert-json

BrowserKitBrowser::assertJson() improvements and bug fix

Author: kbond

src/Browser/BrowserKitBrowser.php

@@ -207,11 +207,9 @@ final public function assertHeaderContains(string $header, string $expected): se
     /**
      * @return static
      */
-    final public function assertJson(): self
+    final public function assertJson(string $expectedContentType = 'json'): self
     {
-        return $this->wrapMinkExpectation(
-            fn() => $this->webAssert()->responseHeaderContains('Content-Type', 'application/json')
-        );
+        return $this->assertHeaderContains('Content-Type', $expectedContentType);
     }
 
     /**

src/Browser/Mink/PantherDriver.php

@@ -77,8 +77,8 @@ public function getText($xpath): string
         if (($element = $crawler->getElement(0)) && 'title' === $element->getTagName()) {
             // hack to get the text of the title html element
             // for this element, WebDriverElement::getText() returns an empty string
-            // the only way to get the value is to get the html
-            return \strip_tags($crawler->html());
+            // the only way to get the value is to get title from the client
+            return $this->client->getTitle();
         }
 
         $text = $crawler->text();

src/Browser/Response/JsonResponse.php

@@ -13,6 +13,10 @@ final class JsonResponse extends Response
 {
     public function json()
     {
+        if (empty($this->body())) {
+            return null;
+        }
+
         return \json_decode($this->body(), true, 512, \JSON_THROW_ON_ERROR);
     }
 

tests/BrowserKitBrowserTests.php

@@ -256,6 +256,34 @@ public function can_assert_json_matches(): void
         ;
     }
 
+    /**
+     * @test
+     */
+    public function assert_json_alternate_content_types(): void
+    {
+        $this->browser()
+            ->get('/json?content-type=application/vnd.custom.json', ['json' => 'foo'])
+            ->assertSuccessful()
+            ->assertJson()
+            ->assertJson('application/vnd.custom.json')
+        ;
+    }
+
+    /**
+     * @test
+     */
+    public function can_dump_empty_json_request(): void
+    {
+        $output = self::catchVarDumperOutput(function() {
+            $this->browser()
+                ->post('/json')
+                ->dump()
+            ;
+        });
+
+        $this->assertStringContainsString('content-type: application/json', $output[0]);
+    }
+
     /**
      * @test
      */

tests/Fixture/Kernel.php

@@ -75,7 +75,12 @@ public function httpMethod(Request $request): Response
 
     public function json(Request $request): JsonResponse
     {
-        return new JsonResponse($request->getContent(), 200, [], true);
+        return new JsonResponse(
+            $request->getContent(),
+            200,
+            ['Content-Type' => $request->query->get('content-type', 'application/json')],
+            true
+        );
     }
 
     public function exception(): void

tests/PantherBrowserTest.php

@@ -187,6 +187,22 @@ public function cannot_follow_invisible_link(): void
         ;
     }
 
+    /**
+     * @test
+     */
+    public function can_dump_html_element(): void
+    {
+        $this->markTestIncomplete('TODO: fix.');
+    }
+
+    /**
+     * @test
+     */
+    public function if_dump_selector_matches_multiple_elements_all_are_dumped(): void
+    {
+        $this->markTestIncomplete('TODO: fix.');
+    }
+
     protected function browser(): PantherBrowser
     {
         return $this->pantherBrowser();