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

Timestamp:

03/06/2016 07:49:54 PM (4 years ago)

Author:

ocean90

Message:

Dependencies: Improve group processing of script dependencies.

This is a follow-up to [36604].

When processing dependencies $this->group will be the minimum of the script's registered group and all preceding siblings. This is wrong because only a scripts ancestors in the dependency chain should affect where it is loaded. Effectively $this->group introduced a form of global state which potentially corrupted the group of dependencies. Sorting covers up this problem.
The issue in #35873 was that script were not moving their dependencies to a lower group when necessary.

The fix:

• In WP_Dependencies::all_deps() pass the new $group value to WP_Dependencies::all_deps(). Previously the wrong value was passed because the parent script could have moved with WP_Scripts::set_group().
• In WP_Scripts::all_deps() pass the $group parameter to WP_Dependencies::all_deps() so it doesn't always use false for $group. Same for WP_Styles::all_deps().

Props stephenharris, gitlost.
Fixes #35956.

File:

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

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

@@ -273 +273 @@
      */
     function test_wp_register_script_with_dependencies_in_head_and_footer() {
-        wp_register_script( 'parent', '/parent.js', array( 'child' ), '1', true ); // in footer
-        wp_register_script( 'child', '/child.js', array( 'grandchild' ), '1', false ); // in head
-        wp_register_script( 'grandchild', '/grandchild.js', array(), '1', true ); // in footer
+        wp_register_script( 'parent', '/parent.js', array( 'child-head' ), null, true ); // in footer
+        wp_register_script( 'child-head', '/child-head.js', array( 'child-footer' ), null, false ); // in head
+        wp_register_script( 'child-footer', '/child-footer.js', array(), null, true ); // in footer
 
         wp_enqueue_script( 'parent' );
@@ -282 +282 @@
         $footer = get_echo( 'wp_print_footer_scripts' );
 
-        $expected_header  = "<script type='text/javascript' src='/grandchild.js?ver=1'></script>\n";
-        $expected_header .= "<script type='text/javascript' src='/child.js?ver=1'></script>\n";
-        $expected_footer  = "<script type='text/javascript' src='/parent.js?ver=1'></script>\n";
+        $expected_header  = "<script type='text/javascript' src='/child-footer.js'></script>\n";
+        $expected_header .= "<script type='text/javascript' src='/child-head.js'></script>\n";
+        $expected_footer  = "<script type='text/javascript' src='/parent.js'></script>\n";
+
+        $this->assertEquals( $expected_header, $header );
+        $this->assertEquals( $expected_footer, $footer );
+    }
+
+    /**
+     * @ticket 35956
+     */
+    function test_wp_register_script_with_dependencies_in_head_and_footer_in_reversed_order() {
+        wp_register_script( 'child-head', '/child-head.js', array(), null, false ); // in head
+        wp_register_script( 'child-footer', '/child-footer.js', array(), null, true ); // in footer
+        wp_register_script( 'parent', '/parent.js', array( 'child-head', 'child-footer' ), null, true ); // in footer
+
+        wp_enqueue_script( 'parent' );
+
+        $header = get_echo( 'wp_print_head_scripts' );
+        $footer = get_echo( 'wp_print_footer_scripts' );
+
+        $expected_header  = "<script type='text/javascript' src='/child-head.js'></script>\n";
+        $expected_footer  = "<script type='text/javascript' src='/child-footer.js'></script>\n";
+        $expected_footer .= "<script type='text/javascript' src='/parent.js'></script>\n";
+
+        $this->assertEquals( $expected_header, $header );
+        $this->assertEquals( $expected_footer, $footer );
+    }
+
+    /**
+     * @ticket 35956
+     */
+    function test_wp_register_script_with_dependencies_in_head_and_footer_in_reversed_order_and_two_parent_scripts() {
+        wp_register_script( 'grandchild-head', '/grandchild-head.js', array(), null, false ); // in head
+        wp_register_script( 'child-head', '/child-head.js', array(), null, false ); // in head
+        wp_register_script( 'child-footer', '/child-footer.js', array( 'grandchild-head' ), null, true ); // in footer
+        wp_register_script( 'child2-head', '/child2-head.js', array(), null, false ); // in head
+        wp_register_script( 'child2-footer', '/child2-footer.js', array(), null, true ); // in footer
+        wp_register_script( 'parent-footer', '/parent-footer.js', array( 'child-head', 'child-footer', 'child2-head', 'child2-footer' ), null, true ); // in footer
+        wp_register_script( 'parent-header', '/parent-header.js', array( 'child-head' ), null, false ); // in head
+
+        wp_enqueue_script( 'parent-footer' );
+        wp_enqueue_script( 'parent-header' );
+
+        $header = get_echo( 'wp_print_head_scripts' );
+        $footer = get_echo( 'wp_print_footer_scripts' );
+
+        $expected_header  = "<script type='text/javascript' src='/child-head.js'></script>\n";
+        $expected_header .= "<script type='text/javascript' src='/grandchild-head.js'></script>\n";
+        $expected_header .= "<script type='text/javascript' src='/child2-head.js'></script>\n";
+        $expected_header .= "<script type='text/javascript' src='/parent-header.js'></script>\n";
+
+        $expected_footer  = "<script type='text/javascript' src='/child-footer.js'></script>\n";
+        $expected_footer .= "<script type='text/javascript' src='/child2-footer.js'></script>\n";
+        $expected_footer .= "<script type='text/javascript' src='/parent-footer.js'></script>\n";
 
         $this->assertEquals( $expected_header, $header );
@@ -383 +435 @@
 
     /**
-     * @ticket 14853-2
+     * @ticket 14853
      */
     public function test_wp_add_inline_script_before_with_concat() {