diff --git a/core/modules/rest/src/Tests/UpdateTest.php b/core/modules/rest/src/Tests/UpdateTest.php index 8d52f0e..c72ba30 100644 --- a/core/modules/rest/src/Tests/UpdateTest.php +++ b/core/modules/rest/src/Tests/UpdateTest.php @@ -166,7 +166,6 @@ public function testPatchUpdate() { * Tests several valid and invalid update requests for the 'user' entity type. */ public function testUpdateUser() { - $this->guzzle = TRUE; $serializer = $this->container->get('serializer'); $entity_type = 'user'; // Enables the REST service for 'user' entity type. @@ -204,6 +203,7 @@ public function testUpdateUser() { $serialized = $serializer->serialize($normalized, $this->defaultFormat, $context); $this->httpRequest($account->urlInfo(), 'PATCH', $serialized, $this->defaultMimeType); $this->assertResponse(204); + $this->curlCookies = $this->cookies; // Try to change the password without providing the current password. $new_password = $this->randomString(); diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php index 8fae81a..429ff85 100644 --- a/core/modules/simpletest/src/WebTestBase.php +++ b/core/modules/simpletest/src/WebTestBase.php @@ -121,20 +121,12 @@ protected $loggedInUser = FALSE; /** - * Guzzle Test. - * - * @var \Drupal\Core\Session\AccountInterface|bool - */ - protected $guzzle = FALSE; - - /** * The "#1" admin user. * * @var \Drupal\Core\Session\AccountInterface */ protected $rootUser; - /** * The current cookie file used by cURL. * @@ -511,11 +503,6 @@ protected function drupalLogout() { // idea being if you were properly logged out you should be seeing a login // screen. - if ($this->guzzle) { - $this->httpRequest('user/logout', 'GET'); - } else { - $this->drupalGet('user/logout', array('query' => array('destination' => 'user/login'))); - } $this->assertResponse(200, 'User was logged out.'); $pass = $this->assertField('name', 'Username field found.', 'Logout'); $pass = $pass && $this->assertField('pass', 'Password field found.', 'Logout');