comparison core/modules/system/tests/src/Functional/CsrfRequestHeaderTest.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

 
 namespace Drupal\Tests\system\Functional;
 
 use Drupal\Core\Url;
 use Drupal\Tests\BrowserTestBase;
-use GuzzleHttp\Cookie\CookieJar;
 
 /**
  * Tests protecting routes by requiring CSRF token in the request header.
  *
  * @group system

    *
    * This checks one route that uses _csrf_request_header_token and one that
    * uses the deprecated _access_rest_csrf.
    */
   public function testRouteAccess() {
-    $client = \Drupal::httpClient();
+    $client = $this->getHttpClient();
     $csrf_token_paths = ['deprecated/session/token', 'session/token'];
     // Test using the both the current path and a test path that returns
     // a token using the deprecated 'rest' value.
     // Checking /deprecated/session/token can be removed in 8.3.
     // @see \Drupal\Core\Access\CsrfRequestHeaderAccessCheck::access()

 
         $csrf_token = $this->drupalGet($csrf_token_path);
         $url = Url::fromRoute($route_name)
           ->setAbsolute(TRUE)
           ->toString();
-        $domain = parse_url($url, PHP_URL_HOST);
-
-        $session_id = $this->getSession()->getCookie($this->getSessionName());
-        /** @var \GuzzleHttp\Cookie\CookieJar $cookies */
-        $cookies = CookieJar::fromArray([$this->getSessionName() => $session_id], $domain);
         $post_options = [
           'headers' => ['Accept' => 'text/plain'],
           'http_errors' => FALSE,
         ];
 

         $result = $client->post($url, $post_options);
         $this->assertEquals(200, $result->getStatusCode());
 
         // Add cookies to POST options so that all other requests are for the
         // authenticated user.
-        $post_options['cookies'] = $cookies;
+        $post_options['cookies'] = $this->getSessionCookies();
 
         // Test that access is denied with no token in header.
         $result = $client->post($url, $post_options);
         $this->assertEquals(403, $result->getStatusCode());