vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update jQuery step two:

Browse Source 
- 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@49101 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2020-10-07 16:31:53 +00:00
parent 0d313839e6
commit 9c50d3dda5
51 changed files with 30968 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/phpunit/tests/dependencies/jquery.php
View File

@@ -10,22 +10,23 @@ class Tests_Dependencies_jQuery extends WP_UnitTestCase {
$scripts = new WP_Scripts;
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',
);
}
$object = $scripts->query( 'jquery', 'registered' );
$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 ) {
$o = $scripts->query( $dep, 'registered' );
@@ -33,7 +34,6 @@ class Tests_Dependencies_jQuery extends WP_UnitTestCase {
$this->assertTrue( isset( $jquery_scripts[ $dep ] ) );
$this->assertSame( $jquery_scripts[ $dep ], $o->src );
}
*/
}
function test_presence_of_jquery_no_conflict() {
@@ -120,7 +120,7 @@ class Tests_Dependencies_jQuery extends WP_UnitTestCase {
}
// 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 );
$this->assertNotContains( 'jquery', $scripts->done );
@@ -130,10 +130,9 @@ class Tests_Dependencies_jQuery extends WP_UnitTestCase {
$scripts->do_items( false, 1 );
$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' );
*/
}
}

8
tests/phpunit/tests/dependencies/scripts.php
View File

@@ -632,7 +632,7 @@ JS;
$wp_scripts->do_concat = true;
$ver = get_bloginfo( 'version' );
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core&amp;ver={$ver}'></script>\n";
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$ver}'></script>\n";
$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
@@ -657,7 +657,7 @@ JS;
$wp_scripts->do_concat = true;
$ver = get_bloginfo( 'version' );
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core&amp;ver={$ver}'></script>\n";
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$ver}'></script>\n";
$expected .= "<!--[if gte IE 9]>\n";
$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
@@ -686,7 +686,7 @@ JS;
$wp_scripts->do_concat = true;
$ver = get_bloginfo( 'version' );
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core&amp;ver={$ver}'></script>\n";
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$ver}'></script>\n";
$expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";
$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
@@ -712,7 +712,7 @@ JS;
$wp_scripts->do_concat = true;
$ver = get_bloginfo( 'version' );
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core&amp;ver={$ver}'></script>\n";
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$ver}'></script>\n";
$expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";
$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
$expected .= "<script type='text/javascript' src='/wp-includes/js/dist/vendor/wp-polyfill.min.js' id='wp-polyfill-js'></script>\n";