Changeset 46612 for trunk/tests/phpunit/tests/dependencies/scripts.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/dependencies/scripts.php (modified) (7 diffs)

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -847 +847 @@
                 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n";
 
-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+                $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );
         }
 
@@ -872 +872 @@
                 $expected .= "<script type='text/javascript' src='/wp-content/plugins/my-plugin/js/script.js'></script>\n";
 
-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+                $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );
         }
 
@@ -897 +897 @@
                 $expected .= "<script type='text/javascript' src='/wp-content/themes/my-theme/js/script.js'></script>\n";
 
-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+                $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );
         }
 
@@ -922 +922 @@
                 $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js'></script>\n";
 
-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+                $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );
         }
 
@@ -962 +962 @@
                 $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js'></script>\n";
 
-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+                $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );
         }
 
@@ -989 +989 @@
                 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n";
 
-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+                $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );
         }
 
@@ -1017 +1017 @@
                 $expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js'></script>\n";
 
-                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+                $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );
         }