<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[53432] branches/6.0/tests/phpunit/tests/blocks/renderCommentTemplate.php: Build/Test Tools: Add tests and fix comments odd/even instabilities (test leaks).</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/53432">53432</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/53432","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-05-23 14:04:23 +0000 (Mon, 23 May 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test Tools: Add tests and fix comments odd/even instabilities (test leaks).
<a href="https://core.trac.wordpress.org/changeset/53353">[53353]</a> Add unit test for Comment Template block.
<a href="https://core.trac.wordpress.org/changeset/53353">[53353]</a> The odd / even class attribute global variables are causing issues in comments tests when a new test is added or an existing test is modified. To stabilize the odd / even comment tests, the comment global variables are added to the base test class' tear_down() using the same patterns as the other global resets. This change ensures each comment test starts at the same state. In doing so, the expected odd / even class attributes are no longer affected by previous tests, i.e. test leaks.
Also moves the comment globals reset from the base test case to the test's `tear_down()`. Why? To avoid risks to extenders' tests as it's too late in the 6.0 cycle for a dev note.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/53298">[53298]</a>, <a href="https://core.trac.wordpress.org/changeset/53172">[53172]</a>, <a href="https://core.trac.wordpress.org/changeset/53138">[53138]</a>.
Props bernhard-reiter, darerodz, gziolo, hellofromTonya, zieladam, peterwilsoncc.
Merges <a href="https://core.trac.wordpress.org/changeset/53353">[53353]</a> and <a href="https://core.trac.wordpress.org/changeset/53430">[53430]</a> to the 6.0 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/54725">#54725</a>,<a href="https://core.trac.wordpress.org/ticket/55643">#55643</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches60testsphpunitincludesabstracttestcasephp">branches/6.0/tests/phpunit/includes/abstract-testcase.php</a></li>
<li><a href="#branches60testsphpunittestsblocksrenderCommentTemplatephp">branches/6.0/tests/phpunit/tests/blocks/renderCommentTemplate.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches60">branches/6.0/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.0
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.0 2022-05-23 13:30:13 UTC (rev 53431)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.0 2022-05-23 14:04:23 UTC (rev 53432)
</ins><a id="branches60"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:53349,53352,53354,53358,53360,53362,53366,53368,53370,53372-53373,53375,53377-53378,53382-53383,53388,53402-53404,53409,53413,53416,53418-53421
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:53349,53352-53354,53358,53360,53362,53366,53368,53370,53372-53373,53375,53377-53378,53382-53383,53388,53402-53404,53409,53413,53416,53418-53421,53430
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches60testsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tests/phpunit/includes/abstract-testcase.php 2022-05-23 13:30:13 UTC (rev 53431)
+++ branches/6.0/tests/phpunit/includes/abstract-testcase.php 2022-05-23 14:04:23 UTC (rev 53432)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,6 +174,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS[ $global ] = null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reset comment globals.
+ $comment_globals = array( 'comment_alt', 'comment_depth', 'comment_thread_alt' );
+ foreach ( $comment_globals as $global ) {
+ $GLOBALS[ $global ] = null;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Reset $wp_sitemap global so that sitemap-related dynamic $wp->public_query_vars
</span><span class="cx" style="display: block; padding: 0 10px"> * are added when the next test runs.
</span></span></pre></div>
<a id="branches60testsphpunittestsblocksrenderCommentTemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tests/phpunit/tests/blocks/renderCommentTemplate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tests/phpunit/tests/blocks/renderCommentTemplate.php 2022-05-23 13:30:13 UTC (rev 53431)
+++ branches/6.0/tests/phpunit/tests/blocks/renderCommentTemplate.php 2022-05-23 14:04:23 UTC (rev 53432)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,12 +20,57 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private static $comment_ids;
</span><span class="cx" style="display: block; padding: 0 10px"> private static $per_page = 5;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Array of the comments options and their original values.
+ * Used to reset the options after each test.
+ *
+ * @var array
+ */
+ private static $original_options;
+
+ public static function set_up_before_class() {
+ parent::set_up_before_class();
+
+ // Store the original option values.
+ $options = array(
+ 'comment_order',
+ 'comments_per_page',
+ 'default_comments_page',
+ 'page_comments',
+ 'previous_default_page',
+ 'thread_comments_depth',
+ );
+ foreach ( $options as $option ) {
+ static::$original_options[ $option ] = get_option( $option );
+ }
+
+ // Reset comment globals.
+ $comment_globals = array( 'comment_alt', 'comment_depth', 'comment_thread_alt' );
+ foreach ( $comment_globals as $global ) {
+ $GLOBALS[ $global ] = null;
+ }
+ }
+
+ public function tear_down() {
+ // Reset the comment options to their original values.
+ foreach ( static::$original_options as $option => $original_value ) {
+ update_option( $option, $original_value );
+ }
+
+ // Reset comment globals.
+ $comment_globals = array( 'comment_alt', 'comment_depth', 'comment_thread_alt' );
+ foreach ( $comment_globals as $global ) {
+ $GLOBALS[ $global ] = null;
+ }
+
+ parent::tear_down();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function set_up() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_comments', true );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'comments_per_page', self::$per_page );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'comment_order', 'ASC' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$custom_post = self::factory()->post->create_and_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +154,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> build_comment_query_vars_from_block( $block )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'page_comments', true );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,9 +231,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> build_comment_query_vars_from_block( $block )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- update_option( 'comments_per_page', $comments_per_page );
- update_option( 'default_comments_page', $default_comments_page );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,9 +302,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * └─ comment 1
</span><span class="cx" style="display: block; padding: 0 10px"> * └─ comment 2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * └─ comment 3
</del><span class="cx" style="display: block; padding: 0 10px"> * └─ comment 4
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * └─ comment 5
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * └─ comment 3
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 55567
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +349,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="cx" style="display: block; padding: 0 10px"> <<<END
</span><span class="cx" style="display: block; padding: 0 10px"> <ol class="wp-block-comment-template">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li id="comment-{$top_level_ids[0]}" class="comment odd alt thread-odd thread-alt depth-1">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li id="comment-{$top_level_ids[0]}" class="comment even thread-even depth-1">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-block-comment-author-name">
</span><span class="cx" style="display: block; padding: 0 10px"> <a rel="external nofollow ugc" href="http://example.com/author-url/" target="_self" >
</span><span class="cx" style="display: block; padding: 0 10px"> Test
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +359,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>Hello world</p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li id="comment-{$first_level_ids[0]}" class="comment even depth-2">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li id="comment-{$first_level_ids[0]}" class="comment odd alt depth-2">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-block-comment-author-name">
</span><span class="cx" style="display: block; padding: 0 10px"> <a rel="external nofollow ugc" href="http://example.com/author-url/" target="_self" >
</span><span class="cx" style="display: block; padding: 0 10px"> Test
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,7 +369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>Hello world</p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li id="comment-{$second_level_ids[0]}" class="comment odd alt depth-3">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li id="comment-{$second_level_ids[0]}" class="comment even depth-3">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-block-comment-author-name">
</span><span class="cx" style="display: block; padding: 0 10px"> <a rel="external nofollow ugc" href="http://example.com/author-url/" target="_self" >
</span><span class="cx" style="display: block; padding: 0 10px"> Test
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,7 +381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li id="comment-{$first_level_ids[1]}" class="comment even depth-2">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li id="comment-{$first_level_ids[1]}" class="comment odd alt depth-2">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-block-comment-author-name">
</span><span class="cx" style="display: block; padding: 0 10px"> <a rel="external nofollow ugc" href="http://example.com/author-url/" target="_self" >
</span><span class="cx" style="display: block; padding: 0 10px"> Test
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,6 +404,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test that line and paragraph breaks are converted to HTML tags in a comment.
+ *
+ * @ticket 55643
+ */
+ function test_render_block_core_comment_content_converts_to_html() {
+ $comment_id = self::$comment_ids[0];
+ $new_content = "Paragraph One\n\nP2L1\nP2L2\n\nhttps://example.com/";
+ self::factory()->comment->update_object(
+ $comment_id,
+ array( 'comment_content' => $new_content )
+ );
+
+ $parsed_blocks = parse_blocks(
+ '<!-- wp:comment-template --><!-- wp:comment-content /--><!-- /wp:comment-template -->'
+ );
+
+ $block = new WP_Block(
+ $parsed_blocks[0],
+ array(
+ 'postId' => self::$custom_post->ID,
+ 'comments/inherit' => true,
+ )
+ );
+
+ $expected_content = "<p>Paragraph One</p>\n<p>P2L1<br />\nP2L2</p>\n<p><a href=\"https://example.com/\" rel=\"nofollow ugc\">https://example.com/</a></p>\n";
+
+ $this->assertSame(
+ '<ol class="wp-block-comment-template"><li id="comment-' . self::$comment_ids[0] . '" class="comment even thread-even depth-1"><div class="wp-block-comment-content">' . $expected_content . '</div></li></ol>',
+ $block->render()
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test that unapproved comments are included if it is a preview.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 55634
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,4 +477,57 @@
</span><span class="cx" style="display: block; padding: 0 10px"> build_comment_query_vars_from_block( $block )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Test rendering an unapproved comment preview.
+ *
+ * @ticket 55643
+ */
+ function test_rendering_comment_template_unmoderated_preview() {
+ $parsed_blocks = parse_blocks(
+ '<!-- wp:comment-template --><!-- wp:comment-author-name /--><!-- wp:comment-content /--><!-- /wp:comment-template -->'
+ );
+
+ $unapproved_comment = self::factory()->comment->create_post_comments(
+ self::$custom_post->ID,
+ 1,
+ array(
+ 'comment_author' => 'Visitor',
+ 'comment_author_email' => 'unapproved@example.org',
+ 'comment_author_url' => 'http://example.com/unapproved/',
+ 'comment_content' => 'Hi there! My comment needs moderation.',
+ 'comment_approved' => 0,
+ )
+ );
+
+ $block = new WP_Block(
+ $parsed_blocks[0],
+ array(
+ 'postId' => self::$custom_post->ID,
+ )
+ );
+
+ $commenter_filter = static function () {
+ return array(
+ 'comment_author_email' => 'unapproved@example.org',
+ );
+ };
+
+ add_filter( 'wp_get_current_commenter', $commenter_filter );
+
+ $this->assertSame(
+ '<ol class="wp-block-comment-template"><li id="comment-' . self::$comment_ids[0] . '" class="comment even thread-even depth-1"><div class="wp-block-comment-author-name"><a rel="external nofollow ugc" href="http://example.com/author-url/" target="_self" >Test</a></div><div class="wp-block-comment-content"><p>Hello world</p></div></li><li id="comment-' . $unapproved_comment[0] . '" class="comment odd alt thread-odd thread-alt depth-1"><div class="wp-block-comment-author-name">Visitor</div><div class="wp-block-comment-content"><p><em class="comment-awaiting-moderation">Your comment is awaiting moderation.</em></p>Hi there! My comment needs moderation.</div></li></ol>',
+ str_replace( array( "\n", "\t" ), '', $block->render() ),
+ 'Should include unapproved comments when filter applied'
+ );
+
+ remove_filter( 'wp_get_current_commenter', $commenter_filter );
+
+ // Test it again and ensure the unmoderated comment doesn't leak out.
+ $this->assertSame(
+ '<ol class="wp-block-comment-template"><li id="comment-' . self::$comment_ids[0] . '" class="comment even thread-even depth-1"><div class="wp-block-comment-author-name"><a rel="external nofollow ugc" href="http://example.com/author-url/" target="_self" >Test</a></div><div class="wp-block-comment-content"><p>Hello world</p></div></li></ol>',
+ str_replace( array( "\n", "\t" ), '', $block->render() ),
+ 'Should not include any unapproved comments after removing filter'
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>