Merge pull request #139 from pulkitjalan/patch-1

[5.x] Remove cookie prefix in seeCookie
laravel · Aug 5, 2020 · ada9025 · ada9025
2 parents c202f99 + 9ab30ed
commit ada9025
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Concerns/MakesHttpRequests.php b/src/Concerns/MakesHttpRequests.php
@@ -619,7 +619,7 @@ protected function seePlainCookie($cookieName, $value = null)
      * @param  bool  $unserialize
      * @return $this
      */
-    protected function seeCookie($cookieName, $value = null, $encrypted = true, $unserialize = true)
+    protected function seeCookie($cookieName, $value = null, $encrypted = true, $unserialize = false)
     {
         $headers = $this->response->headers;
 
@@ -643,6 +643,10 @@ protected function seeCookie($cookieName, $value = null, $encrypted = true, $uns
         $actual = $encrypted
             ? $this->app['encrypter']->decrypt($cookieValue, $unserialize) : $cookieValue;
 
+        $hasValidPrefix = strpos($actual, CookieValuePrefix::create($cookieName, app('encrypter')->getKey())) === 0;
+
+        $actual = $hasValidPrefix ? CookieValuePrefix::remove($actual) : null;
+
         $this->assertEquals(
             $actual, $value,
             "Cookie [{$cookieName}] was found, but value [{$actual}] does not match [{$value}]."