Changeset 61392

Timestamp:

12/18/2025 09:56:44 PM (10 months ago)

Author:

SergeyBiryukov

Message:

Tests: Use assertEqualHTML() in styles HTML tests.

This aims to make the tests more robust.

Follow-up to [287/tests], [749/tests], [25786], [31031], [36550], [46164], [48937], [52036], [61084], [61391].

Props jonsurrell.
See #64225.

File:

• trunk/tests/phpunit/tests/dependencies/styles.php (modified) (12 diffs)

trunk/tests/phpunit/tests/dependencies/styles.php

@@ -69 +69 @@
                 $expected .= "<link rel='stylesheet' id='no-deps-null-version-print-media-css' href='http://example.com' type='text/css' media='print' />\n";
 
-                $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+                $this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 
                 // No styles left to print.
@@ -89 +89 @@
                 $expected = "<link rel='stylesheet' id='no-deps-no-version-css' href='http://example.com?ver=$ver' media='all' />\n";
 
-                $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+                $this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
         }
 
@@ -104 +104 @@
                 $expected = "<link rel='stylesheet' id='$handle-css' href='http://example.com' type='text/css' media='all' />\n";
 
-                $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+                $this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
         }
 
@@ -158 +158 @@
 
                 // Go!
-                $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+                $this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
 
                 // No styles left to print.
@@ -187 +187 @@
                 wp_add_inline_style( 'handle', $style );
 
-                // No styles left to print.
-                $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+                $this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
         }
 
@@ -216 +215 @@
 
                 wp_print_styles();
-                $this->assertSame( $expected, $wp_styles->print_html );
+                $this->assertEqualHTML( $expected, $wp_styles->print_html );
         }
 
@@ -234 +233 @@
          */
         public function test_normalize_relative_css_links( $css, $expected ) {
-                $this->assertSame(
+                $this->assertEqualHTML(
                         $expected,
                         _wp_normalize_relative_css_links( $css, site_url( 'wp-content/themes/test/style.css' ) )
@@ -312 +311 @@
                 wp_add_inline_style( 'handle', $style2 );
 
-                // No styles left to print.
-                $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+                $this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
         }
 
@@ -338 +336 @@
                 wp_add_inline_style( 'handle', "<style>{$style}</style>" );
 
-                $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+                $this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
         }
 
@@ -352 +350 @@
                 wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
 
-                $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+                $this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
         }
 
@@ -362 +360 @@
          */
         public function test_conditional_inline_styles_are_also_conditional() {
-                $expected = '';
                 wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
                 wp_style_add_data( 'handle', 'conditional', 'IE' );
                 wp_add_inline_style( 'handle', 'a { color: blue; }' );
 
-                $this->assertSameIgnoreEOL( $expected, get_echo( 'wp_print_styles' ) );
+                // Conditional styles are disabled.
+                $this->assertSame( '', get_echo( 'wp_print_styles' ) );
         }
 
@@ -400 +398 @@
                 wp_add_inline_style( 'handle-three', $style );
 
-                $this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
+                $this->assertEqualHTML( $expected, get_echo( 'wp_print_styles' ) );
         }