From ece2e850ca73020bae14f5954456ba2bfdf2b89b Mon Sep 17 00:00:00 2001 From: David Baumwald Date: Fri, 27 Jan 2023 20:49:15 +0000 Subject: [PATCH] Tests: Resolve some line endings issues in `blocks/renderCommentTemplate.php` on Windows machines. This change resolves a unit test failure in `Tests_Blocks_RenderReusableCommentTemplate::test_rendering_comment_template_nested()` on systems using `\r\n` line endings. Props SergeyBiryukov. See #56793. git-svn-id: https://develop.svn.wordpress.org/trunk@55153 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/blocks/renderCommentTemplate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/tests/blocks/renderCommentTemplate.php b/tests/phpunit/tests/blocks/renderCommentTemplate.php index 5bfcd76487..38c1d03667 100644 --- a/tests/phpunit/tests/blocks/renderCommentTemplate.php +++ b/tests/phpunit/tests/blocks/renderCommentTemplate.php @@ -333,7 +333,7 @@ class Tests_Blocks_RenderReusableCommentTemplate extends WP_UnitTestCase { $top_level_ids = self::$comment_ids; $expected = str_replace( - array( "\n", "\t" ), + array( "\r\n", "\n", "\t" ), '', << @@ -387,7 +387,7 @@ END $this->assertSame( $expected, - str_replace( array( "\n", "\t" ), '', $block->render() ) + str_replace( array( "\r\n", "\n", "\t" ), '', $block->render() ) ); }