Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / user / tests / src / Functional / UserLoginHttpTest.php

diff --git a/web/core/modules/user/tests/src/Functional/UserLoginHttpTest.php b/web/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
index b12a72b58e8c4d4aee5f095b11576608fffed932..079affaf54aed8f16c3a335ac58f92547276d959 100644 (file)
--- a/web/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
@@ -3,10 +3,10 @@
 namespace Drupal\Tests\user\Functional;
 
 use Drupal\Core\Flood\DatabaseBackend;
+use Drupal\Core\Test\AssertMailTrait;
 use Drupal\Core\Url;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Controller\UserAuthenticationController;
-use Drupal\user\Tests\UserResetEmailTestTrait;
 use GuzzleHttp\Cookie\CookieJar;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
@@ -21,7 +21,9 @@ use Symfony\Component\Serializer\Serializer;
  */
 class UserLoginHttpTest extends BrowserTestBase {
 
-  use UserResetEmailTestTrait;
+  use AssertMailTrait {
+    getMails as drupalGetMails;
+  }
 
   /**
    * Modules to install.
@@ -526,4 +528,17 @@ class UserLoginHttpTest extends BrowserTestBase {
     $this->drupalLogout();
   }
 
+  /**
+   * Login from reset password email.
+   */
+  protected function loginFromResetEmail() {
+    $_emails = $this->drupalGetMails();
+    $email = end($_emails);
+    $urls = [];
+    preg_match('#.+user/reset/.+#', $email['body'], $urls);
+    $resetURL = $urls[0];
+    $this->drupalGet($resetURL);
+    $this->drupalPostForm(NULL, NULL, 'Log in');
+  }
+
 }