Changeset 56748 for trunk/tests/phpunit/tests/dependencies/scripts.php

Timestamp:

09/29/2023 07:45:53 PM (2 years ago)

Author:

westonruter

Message:

Script Loader: Harden removal of script tag wrappers.

• Add wp_remove_surrounding_empty_script_tags() to more precisely remove script tag wrappers and warn when doing it wrong.
• Add clarifying comments for XML escaping logic in wp_get_inline_script_tag().
• Leverage WP_HTML_Tag_Processor in test_remove_frameless_preview_messenger_channel.
• Reuse assertEqualMarkup in test_blocking_dependent_with_delayed_dependency.
• Normalize whitespace in parse_markup_fragment for assertEqualMarkup.

Follow-up to [56687].
Props dmsnell, westonruter, flixos90.
See #58664.

File:

• trunk/tests/phpunit/tests/dependencies/scripts.php (modified) (2 diffs)

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

@@ -261 +261 @@
         wp_enqueue_script( 'dependent-script-a3', '/dependent-script-a3.js', array( 'main-script-a3' ), null );
         $output   = get_echo( 'wp_print_scripts' );
-        $expected = str_replace( "'", '"', "<script type='text/javascript' src='/main-script-a3.js' id='main-script-a3-js' data-wp-strategy='{$strategy}'></script>" );
-        $this->assertStringContainsString( $expected, $output, 'Blocking dependents must force delayed dependencies to become blocking.' );
+        $expected = <<<JS
+            <script type='text/javascript' src='/main-script-a3.js' id='main-script-a3-js' data-wp-strategy='{$strategy}'></script>
+            <script id="dependent-script-a3-js" src="/dependent-script-a3.js" type="text/javascript"></script>
+JS;
+        $this->assertEqualMarkup( $expected, $output, 'Blocking dependents must force delayed dependencies to become blocking.' );
     }
 
@@ -2998 +3001 @@
         }
 
+        // Normalize other whitespace nodes.
+        $xpath = new DOMXPath( $dom );
+        foreach ( $xpath->query( '//text()' ) as $node ) {
+            /** @var DOMText $node */
+            if ( preg_match( '/^\s+$/', $node->nodeValue ) ) {
+                $node->nodeValue = ' ';
+            }
+        }
+
         return $dom;
     }