Changeset 46612 for trunk/tests/phpunit/tests/formatting/Autop.php

Timestamp:

10/29/2019 02:26:41 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Ignore EOL differences in tests using multiline string assertions.

Unix vs. Windows EOL style mismatches can cause misleading failures in tests using the heredoc syntax (<<<) or multiline strings as the expected result.

Fixes #31432. See #42594, #47411.

File:

• trunk/tests/phpunit/tests/formatting/Autop.php (modified) (6 diffs)

trunk/tests/phpunit/tests/formatting/Autop.php

@@ -503 +503 @@
 line 5</p>';
 
-                $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+                $this->assertEqualsIgnoreEOL( $expected, trim( wpautop( $content ) ) );
         }
 
@@ -522 +522 @@
 <p>line 2</p>';
 
-                $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+                $this->assertEqualsIgnoreEOL( $expected, trim( wpautop( $content ) ) );
         }
 
@@ -544 +544 @@
          * @ticket 39307
          */
-        function test_that_wpautop_doses_not_add_extra_closing_p_in_figure() {
+        function test_that_wpautop_does_not_add_extra_closing_p_in_figure() {
                 $content1  = '<figure><img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
                 $expected1 = $content1;
@@ -557 +557 @@
 
                 $this->assertEquals( $expected1, trim( wpautop( $content1 ) ) );
-                $this->assertEquals( $expected2, trim( wpautop( $content2 ) ) );
+                $this->assertEqualsIgnoreEOL( $expected2, trim( wpautop( $content2 ) ) );
         }
 
@@ -585 +585 @@
                 $expected = '<p>' . $content . '</p>';
 
-                $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+                $this->assertEqualsIgnoreEOL( $expected, trim( wpautop( $content ) ) );
         }
 
@@ -601 +601 @@
                 $expected = '<p>' . $content . '</p>';
 
-                $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+                $this->assertEqualsIgnoreEOL( $expected, trim( wpautop( $content ) ) );
         }
 }