Merge pull request #28913 from SjorsO/5.8

[5.8] Don't check for status code in assertJsonMissingValidationErrors()
laravel · Jun 22, 2019 · 7593d65 · 7593d65
2 parents d1b422b + 1e4e640
commit 7593d65
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/Illuminate/Foundation/Testing/TestResponse.php b/src/Illuminate/Foundation/Testing/TestResponse.php
@@ -697,7 +697,7 @@ public function assertJsonValidationErrors($errors)
      */
     public function assertJsonMissingValidationErrors($keys = null)
     {
-        if (empty($this->getContent()) && $this->getStatusCode() == 204) {
+        if ($this->getContent() === '') {
             PHPUnit::assertTrue(true);
 
             return $this;

diff --git a/tests/Foundation/FoundationTestResponseTest.php b/tests/Foundation/FoundationTestResponseTest.php
@@ -581,18 +581,23 @@ public function testAssertJsonMissingValidationErrorsWithoutArgumentCanFail()
 
     public function testAssertJsonMissingValidationErrorsOnAnEmptyResponse()
     {
-        $emptyTestResponse204 = TestResponse::fromBaseResponse(
+        $emptyResponse = TestResponse::fromBaseResponse(
             (new Response)->setContent('')
         );
-        $emptyTestResponse204->setStatusCode(204);
-        $emptyTestResponse204->assertJsonMissingValidationErrors();
 
+        $emptyResponse->assertJsonMissingValidationErrors();
+    }
+
+    public function testAssertJsonMissingValidationErrorsOnInvalidJson()
+    {
         $this->expectException(AssertionFailedError::class);
+        $this->expectExceptionMessage('Invalid JSON was returned from the route.');
 
-        $emptyTestResponseNot204 = TestResponse::fromBaseResponse(
-            (new Response)->setContent('')
+        $invalidJsonResponse = TestResponse::fromBaseResponse(
+            (new Response)->setContent('~invalid json')
         );
-        $emptyTestResponseNot204->assertJsonMissingValidationErrors();
+
+        $invalidJsonResponse->assertJsonMissingValidationErrors();
     }
 
     public function testMacroable()