From b4d8e87464c9a4d7869584a4ade9db77925e998d Mon Sep 17 00:00:00 2001 From: Felix Arntz Date: Thu, 5 Jul 2018 08:52:06 +0000 Subject: [PATCH] Tests: Fix failing test after [43388]. Fixes #44396. git-svn-id: https://develop.svn.wordpress.org/trunk@43390 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/user.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/phpunit/tests/user.php b/tests/phpunit/tests/user.php index 47ae462107..008312687d 100644 --- a/tests/phpunit/tests/user.php +++ b/tests/phpunit/tests/user.php @@ -1516,8 +1516,7 @@ class Tests_User extends WP_UnitTestCase { reset_phpmailer_instance(); - // Give the site and blog a name containing HTML entities - update_site_option( 'site_name', ''Test' site's "name" has <html entities> &' ); + // Give the site a name containing HTML entities update_option( 'blogname', ''Test' blog's "name" has <html entities> &' ); // Set $_POST['email'] with new e-mail and $_POST['user_id'] with user's ID. @@ -1535,11 +1534,6 @@ class Tests_User extends WP_UnitTestCase { $this->assertSame( 'new-email@test.dev', $recipient->address, 'User email change confirmation recipient not as expected' ); // Assert that HTML entites have been decoded in body and subject - if ( is_multisite() ) { - $this->assertContains( '\'Test\' site\'s "name" has &', $email->body, 'Email body does not contain the decoded HTML entities' ); - $this->assertNotContains( ''Test' site's "name" has <html entities> &', $email->body, 'Email body does contains HTML entities' ); - } - $this->assertContains( '\'Test\' blog\'s "name" has &', $email->subject, 'Email subject does not contain the decoded HTML entities' ); $this->assertNotContains( ''Test' blog's "name" has <html entities> &', $email->subject, 'Email subject does contains HTML entities' ); }