Changeset 49101 for trunk/tests/phpunit/tests/dependencies/jquery.php

Timestamp:

10/07/2020 04:31:53 PM (4 years ago)

Author:

azaozz

Message:

Update jQuery step two:

• Add jquery-migrate.js v.3.3.1 to core and load it in debug mode when SCRIPT_DEBUG is true.
• Add jquery.min.js, update jquery.js to 3.5.1 non-minified. This should help when debugging.
• Rebuild jQuery UI 1.12.1 and add it to core.
• Fix/adjust tests to match the above changes.

See #50564.

File:

• trunk/tests/phpunit/tests/dependencies/jquery.php (modified) (5 diffs)

trunk/tests/phpunit/tests/dependencies/jquery.php

@@ -11 +11 @@
         wp_default_scripts( $scripts );
 
-        $jquery_scripts = array(
-            'jquery-core' => '/wp-includes/js/jquery/jquery.js',
-        );
         if ( SCRIPT_DEBUG ) {
-            $jquery_scripts['jquery-migrate'] = '/wp-includes/js/jquery/jquery-migrate.js';
+            $jquery_scripts = array(
+                'jquery-core'    => '/wp-includes/js/jquery/jquery.js',
+                'jquery-migrate' => '/wp-includes/js/jquery/jquery-migrate.js',
+            );
         } else {
-            $jquery_scripts['jquery-migrate'] = '/wp-includes/js/jquery/jquery-migrate.min.js';
+            $jquery_scripts = array(
+                'jquery-core'    => '/wp-includes/js/jquery/jquery.min.js',
+                'jquery-migrate' => '/wp-includes/js/jquery/jquery-migrate.min.js',
+            );
         }
 
@@ -23 +26 @@
         $this->assertInstanceOf( '_WP_Dependency', $object );
 
-        // As of 5.5 jQuery 1.12.4 is loaded without Migrate 1.4.1.
-        // Disable, but keep the following test for 5.6 when jQuery would be updated to 3.5.1+ and
-        // the latest Migrate will be used.
-        /*
+        // The following test is disabled in WP 5.5 as jQuery 1.12.4 is loaded without jQuery Migrate 1.4.1,
+        // and reenabled in 5.6 when jQuery 3.5.1 is loaded with jQuery Migrate 3.3.1.
         $this->assertSameSets( $object->deps, array_keys( $jquery_scripts ) );
         foreach ( $object->deps as $dep ) {
@@ -34 +35 @@
             $this->assertSame( $jquery_scripts[ $dep ], $o->src );
         }
-        */
     }
 
@@ -121 +121 @@
 
         // Match only one script tag for 5.5, revert to `{2}` for 5.6.
-        $this->expectOutputRegex( '/^(?:<script[^>]+><\/script>\\n){1}$/' );
+        $this->expectOutputRegex( '/^(?:<script[^>]+><\/script>\\n){2}$/' );
 
         $scripts->do_items( false, 0 );
@@ -131 +131 @@
         $this->assertContains( 'jquery', $scripts->done );
 
-        // Disable for 5.5 but keep for use in 5.6. See test_location_of_jquery() above.
-        /*
+        // The following test is disabled in WP 5.5 as jQuery 1.12.4 is loaded without jQuery Migrate 1.4.1,
+        // and reenabled in 5.6 when jQuery 3.5.1 is loaded with Migrate 3.3.1.
         $this->assertContains( 'jquery-core', $scripts->done, 'jquery-core in footer' );
         $this->assertContains( 'jquery-migrate', $scripts->done, 'jquery-migrate in footer' );
-        */
     }
 }