Merge branch 'allow-withCredentials-for-json-in-tests' into 7.x

Author: taylorotwell

src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php

@@ -53,6 +53,15 @@ trait MakesHttpRequests
      */
     protected $encryptCookies = true;
 
+    /**
+     * Indicated whether JSON requests should be performed "with credentials" (cookies).
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/withCredentials
+     *
+     * @var bool
+     */
+    protected $withCredentials = false;
+
     /**
      * Define additional headers to be sent with the request.
      *
@@ -230,6 +239,18 @@ public function followingRedirects()
         return $this;
     }
 
+    /**
+     * Include cookies and authorization headers for JSON requests.
+     *
+     * @return $this
+     */
+    public function withCredentials()
+    {
+        $this->withCredentials = true;
+
+        return $this;
+    }
+
     /**
      * Disable automatic encryption of cookie values.
      *
@@ -449,7 +470,13 @@ public function json($method, $uri, array $data = [], array $headers = [])
         ], $headers);
 
         return $this->call(
-            $method, $uri, [], [], $files, $this->transformHeadersToServerVars($headers), $content
+            $method,
+            $uri,
+            [],
+            $this->prepareCookiesForJsonRequest(),
+            $files,
+            $this->transformHeadersToServerVars($headers),
+            $content
         );
     }
 
@@ -577,6 +604,16 @@ protected function prepareCookiesForRequest()
         })->merge($this->unencryptedCookies)->all();
     }
 
+    /**
+     * If enabled, add cookies for JSON requests.
+     *
+     * @return array
+     */
+    protected function prepareCookiesForJsonRequest()
+    {
+        return $this->withCredentials ? $this->prepareCookiesForRequest() : [];
+    }
+
     /**
      * Follow a redirect chain until a non-redirect is received.
      *

tests/Foundation/Testing/Concerns/MakesHttpRequestsTest.php

@@ -103,6 +103,17 @@ public function testWithUnencryptedCookiesSetsCookiesAndOverwritesPreviousValues
         $this->assertSame('baz', $this->unencryptedCookies['foo']);
         $this->assertSame('new-value', $this->unencryptedCookies['new-cookie']);
     }
+
+    public function testWithoutAndWithCredentials()
+    {
+        $this->encryptCookies = false;
+
+        $this->assertSame([], $this->prepareCookiesForJsonRequest());
+
+        $this->withCredentials();
+        $this->defaultCookies = ['foo' => 'bar'];
+        $this->assertSame(['foo' => 'bar'], $this->prepareCookiesForJsonRequest());
+    }
 }
 
 class MyMiddleware