Changeset 56246

Timestamp:

07/17/2023 02:04:00 PM (17 months ago)

Author:

joemcgill

Message:

Script Loader: Improve test coverage for wp_print_scripts().

This is a follow-up to [56092], which further improves PHPUnit test coverage and inline docs for ensuring async and defer attributes are being properly handled for scripts that are printed without being enqueued.

Props peterwilsoncc, azaozz, westonruter, joemcgill.
See #58648.

Location:

trunk

Files:

• src/wp-includes/class-wp-scripts.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/scripts.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-scripts.php

@@ -915 +915 @@
         }
 
-        // If the intended strategy is 'defer', limit the initial list of eligibles.
+        /*
+         * If the intended strategy is 'defer', limit the initial list of eligible
+         * strategies, since 'async' can fallback to 'defer', but not vice-versa.
+         */
         $initial = ( 'defer' === $intended ) ? array( 'defer' ) : null;
 

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

@@ -2944 +2944 @@
         $actual = get_echo( 'wp_print_scripts', array( array( 'wp-tinymce' ) ) );
 
-        $this->assertStringNotContainsString( 'async', $actual );
+        $this->assertStringNotContainsString( 'async', $actual, 'TinyMCE should not have an async attribute.' );
+        $this->assertStringNotContainsString( 'defer', $actual, 'TinyMCE should not have a defer attribute.' );
+    }
+
+    /**
+     * Make sure scripts with a loading strategy that are printed
+     * without being enqueued are handled properly.
+     *
+     * @ticket 58648
+     *
+     * @dataProvider data_provider_delayed_strategies
+     */
+    public function test_printing_non_enqueued_scripts( $strategy ) {
+        wp_register_script( 'test-script', 'test-script.js', array(), false, array( 'strategy' => $strategy ) );
+
+        $actual = get_echo( 'wp_print_scripts', array( array( 'test-script' ) ) );
+
+        $this->assertStringContainsString( $strategy, $actual );
     }