Merge branch '5.6' of https://github.com/Juddling/framework into Juddling-5.6

Author: taylorotwell

src/Illuminate/Foundation/Testing/TestResponse.php

@@ -466,12 +466,12 @@ public function assertJsonFragment(array $data)
         ));
 
         foreach (Arr::sortRecursive($data) as $key => $value) {
-            $expected = substr(json_encode([$key => $value]), 1, -1);
+            $expected = $this->jsonSearchStrings($key, $value);
 
             PHPUnit::assertTrue(
                 Str::contains($actual, $expected),
                 'Unable to find JSON fragment: '.PHP_EOL.PHP_EOL.
-                "[{$expected}]".PHP_EOL.PHP_EOL.
+                '['.json_encode([$key => $value]).']'.PHP_EOL.PHP_EOL.
                 'within'.PHP_EOL.PHP_EOL.
                 "[{$actual}]."
             );
@@ -498,12 +498,12 @@ public function assertJsonMissing(array $data, $exact = false)
         ));
 
         foreach (Arr::sortRecursive($data) as $key => $value) {
-            $unexpected = substr(json_encode([$key => $value]), 1, -1);
+            $unexpected = $this->jsonSearchStrings($key, $value);
 
             PHPUnit::assertFalse(
                 Str::contains($actual, $unexpected),
                 'Found unexpected JSON fragment: '.PHP_EOL.PHP_EOL.
-                "[{$unexpected}]".PHP_EOL.PHP_EOL.
+                '['.json_encode([$key => $value]).']'.PHP_EOL.PHP_EOL.
                 'within'.PHP_EOL.PHP_EOL.
                 "[{$actual}]."
             );
@@ -525,7 +525,7 @@ public function assertJsonMissingExact(array $data)
         ));
 
         foreach (Arr::sortRecursive($data) as $key => $value) {
-            $unexpected = substr(json_encode([$key => $value]), 1, -1);
+            $unexpected = $this->jsonSearchStrings($key, $value);
 
             if (! Str::contains($actual, $unexpected)) {
                 return $this;
@@ -540,6 +540,27 @@ public function assertJsonMissingExact(array $data)
         );
     }
 
+    /**
+     * TestResponse::assertJsonFragment and TestResponse::assertJsonMissing search for
+     * JSON encoded strings in the Response. This function returns the set of strings to
+     * be searched for in the response, explicitly adding all of the possible characters
+     * which could follow $value in the response.
+     *
+     * @param $key
+     * @param $value
+     * @return array
+     */
+    protected function jsonSearchStrings($key, $value)
+    {
+        $needle = substr(json_encode([$key => $value]), 1, -1);
+
+        return [
+            $needle.']',
+            $needle.'}',
+            $needle.',',
+        ];
+    }
+
     /**
      * Assert that the response has a given JSON structure.
      *

tests/Foundation/FoundationTestResponseTest.php

@@ -174,6 +174,16 @@ public function testAssertJsonFragment()
         $response->assertJsonFragment(['foobar' => ['foobar_foo' => 'foo', 'foobar_bar' => 'bar']]);
 
         $response->assertJsonFragment(['foo' => 'bar 0', 'bar' => ['foo' => 'bar 0', 'bar' => 'foo 0']]);
+
+        $response = TestResponse::fromBaseResponse(new Response(new JsonSerializableSingleResourceWithIntegersStub()));
+
+        $response->assertJsonFragment(['id' => 10]);
+
+        try {
+            $response->assertJsonFragment(['id' => 1]);
+            $this->fail('Asserting id => 1, existsing in JsonSerializableSingleResourceWithIntegersStub should fail');
+        } catch (\PHPUnit\Framework\ExpectationFailedException $e) {
+        }
     }
 
     public function testAssertJsonStructure()
@@ -217,6 +227,13 @@ public function testAssertJsonCount()
         $response->assertJsonCount(4);
     }
 
+    public function testAssertJsonMissing()
+    {
+        $response = TestResponse::fromBaseResponse(new Response(new JsonSerializableSingleResourceWithIntegersStub));
+
+        $response->assertJsonMissing(['id' => 2]);
+    }
+
     public function testAssertJsonMissingValidationErrors()
     {
         $baseResponse = tap(new Response, function ($response) {
@@ -330,3 +347,15 @@ public function jsonSerialize()
         ];
     }
 }
+
+class JsonSerializableSingleResourceWithIntegersStub implements JsonSerializable
+{
+    public function jsonSerialize()
+    {
+        return [
+            ['id' => 10, 'foo' => 'bar'],
+            ['id' => 20, 'foo' => 'bar'],
+            ['id' => 30, 'foo' => 'bar'],
+        ];
+    }
+}