Skip to content

Tests: Clean up obsolete non-HTML5 tests and documentation #10740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sirreal wants to merge 10 commits into from
Closed

Tests: Clean up obsolete non-HTML5 tests and documentation #10740

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8d74eb2
Remove stale html5 script tag comment.
sirreal Jan 13, 2026
7bf5401
Remove obsolete html5 references from scripts tests
sirreal Jan 13, 2026
291ae9d
Remove outdated type attribute doc comment
sirreal Jan 13, 2026
b78598d
Merge branch 'trunk' into 64442/html5-scripts-removal-cleanup
sirreal Jan 15, 2026
6f60260
Merge branch 'trunk' into 64442/html5-scripts-removal-cleanup
sirreal Jan 15, 2026
c6839b9
Revert stylistic change.
sirreal Jan 15, 2026
af87fbd
Revert stylistic change.
sirreal Jan 15, 2026
d95735c
Remove out-of-date documentation.
sirreal Jan 15, 2026
2175ec1
Merge branch 'trunk' into 64442/html5-scripts-removal-cleanup
sirreal Jan 23, 2026
6100602
Merge branch 'trunk' into 64442/html5-scripts-removal-cleanup
sirreal Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/wp-includes/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2874,7 +2874,6 @@ function wp_enqueue_editor_format_library_assets() {
/**
* Sanitizes an attributes array into an attributes string to be placed inside a `<script>` tag.
*
* Automatically injects type attribute if needed.
* Used by {@see wp_get_script_tag()} and {@see wp_get_inline_script_tag()}.
*
Comment thread
sirreal marked this conversation as resolved.
Outdated
* @since 5.7.0
Expand All @@ -2885,10 +2884,6 @@ function wp_enqueue_editor_format_library_assets() {
function wp_sanitize_script_attributes( $attributes ) {
$attributes_string = '';

/*
* If HTML5 script tag is supported, only the attribute name is added
* to $attributes_string for entries with a boolean value, and that are true.
*/
foreach ( $attributes as $attribute_name => $attribute_value ) {
if ( is_bool( $attribute_value ) ) {
if ( $attribute_value ) {
Expand Down
16 changes: 0 additions & 16 deletions tests/phpunit/tests/dependencies/scripts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,22 +1878,6 @@ public function test_concatenate_with_blocking_script_before_and_after_script_wi
$this->assertEqualHTML( $expected, $print_scripts, '<body>', 'Scripts are being incorrectly concatenated when a main script is registered as deferred after other blocking scripts are registered. Deferred scripts should not be part of the script concat loader query string. ' );
}

/**
* @ticket 42804
*/
public function test_wp_enqueue_script_with_html5_support_does_not_contain_type_attribute() {
global $wp_version;

$GLOBALS['wp_scripts'] = new WP_Scripts();
$GLOBALS['wp_scripts']->default_version = get_bloginfo( 'version' );

wp_enqueue_script( 'empty-deps-no-version', 'example.com' );

$expected = "<script src='http://example.com?ver={$wp_version}' id='empty-deps-no-version-js'></script>\n";

$this->assertEqualHTML( $expected, get_echo( 'wp_print_scripts' ) );
}

/**
* Test the different protocol references in wp_enqueue_script
*
Expand Down
2 changes: 0 additions & 2 deletions tests/phpunit/tests/dependencies/wpLocalizeScript.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ public function test_wp_localize_script_works_before_enqueue_script() {
* @covers ::wp_localize_script
*/
public function test_wp_localize_script_outputs_safe_json() {
add_theme_support( 'html5', array( 'script' ) );

$path = '/test.js';
$base_url = site_url( $path );

Expand Down
34 changes: 1 addition & 33 deletions tests/phpunit/tests/dependencies/wpScriptTag.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
class Tests_Dependencies_wpScriptTag extends WP_UnitTestCase {

public function get_script_tag_type_set() {
add_theme_support( 'html5', array( 'script' ) );

$this->assertEqualHTML(
'<script src="https://localhost/PATH/FILE.js" type="application/javascript" nomodule></script>' . "\n",
"<script src='https://localhost/PATH/FILE.js' type='application/javascript' nomodule></script>\n",
Comment thread
sirreal marked this conversation as resolved.
Outdated
wp_get_script_tag(
array(
'type' => 'application/javascript',
Expand All @@ -22,28 +20,12 @@ public function get_script_tag_type_set() {
)
)
);

remove_theme_support( 'html5' );

$this->assertEqualHTML(
'<script src="https://localhost/PATH/FILE.js" type="application/javascript" nomodule></script>' . "\n",
wp_get_script_tag(
array(
'src' => 'https://localhost/PATH/FILE.js',
'type' => 'application/javascript',
'async' => false,
'nomodule' => true,
)
)
);
}

/**
* @covers ::wp_get_script_tag
*/
public function test_get_script_tag_type_not_set() {
add_theme_support( 'html5', array( 'script' ) );

$this->assertEqualHTML(
'<script src="https://localhost/PATH/FILE.js" nomodule></script>' . "\n",
wp_get_script_tag(
Expand All @@ -54,8 +36,6 @@ public function test_get_script_tag_type_not_set() {
)
)
);

remove_theme_support( 'html5' );
}

/**
Expand All @@ -72,8 +52,6 @@ static function ( $attributes ) {
}
);

add_theme_support( 'html5', array( 'script' ) );

$attributes = array(
'src' => 'https://localhost/PATH/FILE.js',
'id' => 'utils-js-extra',
Expand All @@ -87,16 +65,6 @@ static function ( $attributes ) {
array( $attributes )
)
);

remove_theme_support( 'html5' );

$this->assertEqualHTML(
wp_get_script_tag( $attributes ),
get_echo(
'wp_print_script_tag',
array( $attributes )
)
);
}

/**
Expand Down
Loading