Refactor tests

core/modules/user/tests/src/Functional/UserPasswordResetTest.php

@@ -179,7 +179,10 @@ public function testUserPasswordReset(): void {
     $edit = ['name' => $this->account->getEmail()];
     $this->submitForm($edit, 'Submit');
     // Check that the email message body does not contain HTML entities
-    $this->assertTrue($this->checkBodyText(), 'Email body contains HTML entities');
+    // Assume the most recent email.
+    $_emails = $this->drupalGetMails();
+    $email = end($_emails);
+    $this->assertEquals(htmlspecialchars_decode($email['body']), $email['body'], 'Email body contains HTML entities');
     // Change site name to 'Drupal'
     $config->set('name', "Drupal")->save();
     $this->rebuildContainer();
@@ -341,19 +344,6 @@ public function getResetURL() {
     return $urls[0];
   }
 
-  /**
-   * Checks the email body text for the presence of HTML entities.
-   */
-  public function checkBodyText(): bool {
-    // Assume the most recent email.
-    $_emails = $this->drupalGetMails();
-    $email = end($_emails);
-    if (htmlspecialchars_decode($email['body']) === $email['body']) {
-      return TRUE;
-    }
-    return FALSE;
-  }
-
   /**
    * Tests user password reset while logged in.
    */

core/modules/user/tests/src/FunctionalJavascript/UserPasswordResetTest.php

@@ -85,7 +85,10 @@ public function testUserPasswordResetWithAdditionalAjaxForm(): void {
     $this->submitForm($edit, 'Submit');
 
     // Check that the email message body does not contain HTML entities
-    $this->assertTrue($this->checkBodyText(), 'The body text of the email contains HTML entities');
+    // Assume the most recent email.
+    $_emails = $this->drupalGetMails();
+    $email = end($_emails);
+    $this->assertEquals(htmlspecialchars_decode($email['body']), $email['body'], 'The body text of the email contains HTML entities');
 
     $resetURL = $this->getResetURL();
     $this->drupalGet($resetURL);
@@ -125,17 +128,4 @@ public function getResetURL() {
     return $urls[0];
   }
 
-  /**
-   * Checks the email body text for the presence of HTML entities.
-   */
-  public function checkBodyText(): bool {
-    // Assume the most recent email.
-    $_emails = $this->drupalGetMails();
-    $email = end($_emails);
-    if (htmlspecialchars_decode($email['body']) === $email['body']) {
-      return TRUE;
-    }
-    return FALSE;
-  }
-
 }