Merge pull request #160 from laravel/fix-see-json

Fix seeJson with null data
laravel · Nov 29, 2021 · b8abb69 · b8abb69
2 parents 2dfb9c0 + 721e1e8
commit b8abb69
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Concerns/MakesHttpRequests.php b/src/Concerns/MakesHttpRequests.php
@@ -6,7 +6,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Str;
-use Illuminate\Testing\Assert as PHPUnit;
 use Laravel\BrowserKitTesting\TestResponse;
 use PHPUnit\Framework\ExpectationFailedException;
 use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyUploadedFile;
@@ -420,11 +419,12 @@ public function seeJson(array $data = null, $negate = false)
         if (is_null($data)) {
             $decodedResponse = json_decode($this->response->getContent(), true);
 
-            if (is_null($decodedResponse) || $decodedResponse === false) {
-                PHPUnit::fail(
-                    "JSON was not returned from [{$this->currentUri}]."
-                );
-            }
+            $this->assertTrue(
+                ! is_null($decodedResponse) && $decodedResponse !== false,
+                "JSON was not returned from [{$this->currentUri}]."
+            );
+
+            return $this;
         }
 
         try {