Skip to content

Commit d48fdcb

Browse files
sirrealsirreal
committed
Update remaining attr="attr" tests
1 parent eb96786 commit d48fdcb

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎tests/phpunit/tests/dependencies/scripts.php‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -239,17 +239,17 @@ public function test_before_inline_scripts_with_delayed_main_script( $strategy )
239239
'id' => 'ds-i1-1-js-before',
240240
)
241241
);
242-
$expected .= "<script type='text/javascript' src='http://example.org/ds-i1-1.js' id='ds-i1-1-js' {$strategy}='{$strategy}' data-wp-strategy='{$strategy}'></script>\n";
243-
$expected .= "<script type='text/javascript' src='http://example.org/ds-i1-2.js' id='ds-i1-2-js' {$strategy}='{$strategy}' data-wp-strategy='{$strategy}'></script>\n";
244-
$expected .= "<script type='text/javascript' src='http://example.org/ds-i1-3.js' id='ds-i1-3-js' {$strategy}='{$strategy}' data-wp-strategy='{$strategy}'></script>\n";
242+
$expected .= "<script type='text/javascript' src='http://example.org/ds-i1-1.js' id='ds-i1-1-js' {$strategy} data-wp-strategy='{$strategy}'></script>\n";
243+
$expected .= "<script type='text/javascript' src='http://example.org/ds-i1-2.js' id='ds-i1-2-js' {$strategy} data-wp-strategy='{$strategy}'></script>\n";
244+
$expected .= "<script type='text/javascript' src='http://example.org/ds-i1-3.js' id='ds-i1-3-js' {$strategy} data-wp-strategy='{$strategy}'></script>\n";
245245
$expected .= wp_get_inline_script_tag(
246246
"console.log('before last');\n//# sourceURL=ms-i1-1-js-before",
247247
array(
248248
'id' => 'ms-i1-1-js-before',
249249
'type' => 'text/javascript',
250250
)
251251
);
252-
$expected .= "<script type='text/javascript' src='http://example.org/ms-i1-1.js' id='ms-i1-1-js' {$strategy}='{$strategy}' data-wp-strategy='{$strategy}'></script>\n";
252+
$expected .= "<script type='text/javascript' src='http://example.org/ms-i1-1.js' id='ms-i1-1-js' {$strategy} data-wp-strategy='{$strategy}'></script>\n";
253253

254254
$this->assertEqualHTML( $expected, $output, '<body>', 'Inline scripts in the "before" position, that are attached to a deferred main script, are failing to print/execute.' );
255255
}
@@ -268,7 +268,7 @@ public function test_loading_strategy_with_valid_async_registration() {
268268
// No dependents, No dependencies then async.
269269
wp_enqueue_script( 'main-script-a1', '/main-script-a1.js', array(), null, array( 'strategy' => 'async' ) );
270270
$output = get_echo( 'wp_print_scripts' );
271-
$expected = "<script type='text/javascript' src='/main-script-a1.js' id='main-script-a1-js' async='async' data-wp-strategy='async'></script>\n";
271+
$expected = "<script type='text/javascript' src='/main-script-a1.js' id='main-script-a1-js' async data-wp-strategy='async'></script>\n";
272272
$this->assertEqualHTML( $expected, $output, '<body>', 'Scripts enqueued with an async loading strategy are failing to have the async attribute applied to the script handle when being printed.' );
273273
}
274274

@@ -291,7 +291,7 @@ public function test_delayed_dependent_with_blocking_dependency( $strategy ) {
291291
wp_enqueue_script( 'main-script-a2', '/main-script-a2.js', array( 'dependency-script-a2' ), null, compact( 'strategy' ) );
292292
$output = get_echo( 'wp_print_scripts' );
293293
$expected = "<script id='dependency-script-a2-js' src='/dependency-script-a2.js' type='text/javascript'></script>\n";
294-
$expected .= "<script type='text/javascript' src='/main-script-a2.js' id='main-script-a2-js' {$strategy}='{$strategy}' data-wp-strategy='{$strategy}'></script>";
294+
$expected .= "<script type='text/javascript' src='/main-script-a2.js' id='main-script-a2-js' {$strategy} data-wp-strategy='{$strategy}'></script>";
295295
$this->assertEqualHTML( $expected, $output, '<body>', 'Dependents of a blocking dependency are free to have any strategy.' );
296296
}
297297

@@ -956,7 +956,7 @@ public function data_provider_to_test_various_strategy_dependency_chains() {
956956
scriptEventLog.push( "defer-with-before-inline: before inline" )
957957
//# sourceURL=defer-with-before-inline-js-before
958958
</script>
959-
<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-with-before-inline%3A+script' id='defer-with-before-inline-js' defer='defer' data-wp-strategy='defer'></script>
959+
<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-with-before-inline%3A+script' id='defer-with-before-inline-js' defer data-wp-strategy='defer'></script>
960960
HTML
961961
,
962962
),
@@ -987,9 +987,9 @@ public function data_provider_to_test_various_strategy_dependency_chains() {
987987
wp_enqueue_script( 'theme-functions', 'https://example.com/theme-functions.js', array( 'jquery' ), null, array( 'strategy' => 'defer' ) );
988988
},
989989
'expected_markup' => <<<HTML
990-
<script type='text/javascript' src='http://$wp_tests_domain/wp-includes/js/jquery/jquery.js' id='jquery-core-js' defer='defer' data-wp-strategy='defer'></script>
991-
<script type='text/javascript' src='http://$wp_tests_domain/wp-includes/js/jquery/jquery-migrate.js' id='jquery-migrate-js' defer='defer' data-wp-strategy='defer'></script>
992-
<script type='text/javascript' src='https://example.com/theme-functions.js' id='theme-functions-js' defer='defer' data-wp-strategy='defer'></script>
990+
<script type='text/javascript' src='http://$wp_tests_domain/wp-includes/js/jquery/jquery.js' id='jquery-core-js' defer data-wp-strategy='defer'></script>
991+
<script type='text/javascript' src='http://$wp_tests_domain/wp-includes/js/jquery/jquery-migrate.js' id='jquery-migrate-js' defer data-wp-strategy='defer'></script>
992+
<script type='text/javascript' src='https://example.com/theme-functions.js' id='theme-functions-js' defer data-wp-strategy='defer'></script>
993993
HTML
994994
,
995995
),
@@ -1041,9 +1041,9 @@ public function data_provider_to_test_various_strategy_dependency_chains() {
10411041
$this->enqueue_test_script( 'defer-dependent-of-async-aliases', 'defer', array( $alias_handle ) );
10421042
},
10431043
'expected_markup' => <<<HTML
1044-
<script type='text/javascript' src='https://example.com/external.js?script_event_log=async1%3A+script' id='async1-js' defer='defer' data-wp-strategy='async'></script>
1045-
<script type='text/javascript' src='https://example.com/external.js?script_event_log=async2%3A+script' id='async2-js' defer='defer' data-wp-strategy='async'></script>
1046-
<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-async-aliases%3A+script' id='defer-dependent-of-async-aliases-js' defer='defer' data-wp-strategy='defer'></script>
1044+
<script type='text/javascript' src='https://example.com/external.js?script_event_log=async1%3A+script' id='async1-js' defer data-wp-strategy='async'></script>
1045+
<script type='text/javascript' src='https://example.com/external.js?script_event_log=async2%3A+script' id='async2-js' defer data-wp-strategy='async'></script>
1046+
<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-async-aliases%3A+script' id='defer-dependent-of-async-aliases-js' defer data-wp-strategy='defer'></script>
10471047
HTML
10481048
,
10491049
),
@@ -1174,10 +1174,10 @@ public function test_defer_with_async_dependent() {
11741174
);
11751175
// Note: All of these scripts have fetchpriority=high because the leaf dependent script has that fetch priority.
11761176
$output = get_echo( 'wp_print_scripts' );
1177-
$expected = "<script type='text/javascript' src='/main-script-d4.js' id='main-script-d4-js' defer='defer' data-wp-strategy='defer' fetchpriority='high' data-wp-fetchpriority='auto'></script>\n";
1178-
$expected .= "<script type='text/javascript' src='/dependent-script-d4-1.js' id='dependent-script-d4-1-js' defer='defer' data-wp-strategy='defer' fetchpriority='high' data-wp-fetchpriority='auto'></script>\n";
1179-
$expected .= "<script type='text/javascript' src='/dependent-script-d4-2.js' id='dependent-script-d4-2-js' defer='defer' data-wp-strategy='async' fetchpriority='high' data-wp-fetchpriority='low'></script>\n";
1180-
$expected .= "<script type='text/javascript' src='/dependent-script-d4-3.js' id='dependent-script-d4-3-js' defer='defer' data-wp-strategy='defer' fetchpriority='high'></script>\n";
1177+
$expected = "<script type='text/javascript' src='/main-script-d4.js' id='main-script-d4-js' defer data-wp-strategy='defer' fetchpriority='high' data-wp-fetchpriority='auto'></script>\n";
1178+
$expected .= "<script type='text/javascript' src='/dependent-script-d4-1.js' id='dependent-script-d4-1-js' defer data-wp-strategy='defer' fetchpriority='high' data-wp-fetchpriority='auto'></script>\n";
1179+
$expected .= "<script type='text/javascript' src='/dependent-script-d4-2.js' id='dependent-script-d4-2-js' defer data-wp-strategy='async' fetchpriority='high' data-wp-fetchpriority='low'></script>\n";
1180+
$expected .= "<script type='text/javascript' src='/dependent-script-d4-3.js' id='dependent-script-d4-3-js' defer data-wp-strategy='defer' fetchpriority='high'></script>\n";
11811181

11821182
$this->assertEqualHTML( $expected, $output, '<body>', 'Scripts registered as defer but that have dependents that are async are expected to have said dependents deferred.' );
11831183
}
@@ -1427,7 +1427,7 @@ public function test_priority_of_dependency_for_non_enqueued_dependent() {
14271427

14281428
$actual = $this->normalize_markup_for_snapshot( get_echo( array( $wp_scripts, 'print_scripts' ) ) );
14291429
$this->assertEqualHTML(
1430-
'<script type="text/javascript" src="/wp-includes/js/comment-reply.js" id="comment-reply-js" async="async" data-wp-strategy="async" fetchpriority="low"></script>',
1430+
'<script type="text/javascript" src="/wp-includes/js/comment-reply.js" id="comment-reply-js" async data-wp-strategy="async" fetchpriority="low"></script>',
14311431
$actual,
14321432
'<body>',
14331433
"Snapshot:\n$actual"
@@ -1464,7 +1464,7 @@ public function test_printing_default_script_comment_reply_enqueued_or_not_enque
14641464

14651465
$this->assertEqualHTML(
14661466
sprintf(
1467-
'<script type="text/javascript" src="%s" id="comment-reply-js" async="async" data-wp-strategy="async" fetchpriority="low"></script>',
1467+
'<script type="text/javascript" src="%s" id="comment-reply-js" async data-wp-strategy="async" fetchpriority="low"></script>',
14681468
includes_url( 'js/comment-reply.js' )
14691469
),
14701470
$markup
@@ -1814,7 +1814,7 @@ public function test_concatenate_with_defer_strategy() {
18141814
$print_scripts = get_echo( '_print_scripts' );
18151815

18161816
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one-concat-dep,two-concat-dep,three-concat-dep&amp;ver={$wp_version}'></script>\n";
1817-
$expected .= "<script type='text/javascript' src='/main-script.js' id='main-defer-script-js' defer='defer' data-wp-strategy='defer'></script>\n";
1817+
$expected .= "<script type='text/javascript' src='/main-script.js' id='main-defer-script-js' defer data-wp-strategy='defer'></script>\n";
18181818

18191819
$this->assertEqualHTML( $expected, $print_scripts, '<body>', 'Scripts are being incorrectly concatenated when a main script is registered with a "defer" loading strategy. Deferred scripts should not be part of the script concat loading query.' );
18201820
}
@@ -1845,7 +1845,7 @@ public function test_concatenate_with_async_strategy() {
18451845
$print_scripts = get_echo( '_print_scripts' );
18461846

18471847
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one-concat-dep-1,two-concat-dep-1,three-concat-dep-1&amp;ver={$wp_version}'></script>\n";
1848-
$expected .= "<script type='text/javascript' src='/main-script.js' id='main-async-script-1-js' async='async' data-wp-strategy='async'></script>\n";
1848+
$expected .= "<script type='text/javascript' src='/main-script.js' id='main-async-script-1-js' async data-wp-strategy='async'></script>\n";
18491849

18501850
$this->assertEqualHTML( $expected, $print_scripts, '<body>', 'Scripts are being incorrectly concatenated when a main script is registered with an "async" loading strategy. Async scripts should not be part of the script concat loading query.' );
18511851
}
@@ -1880,7 +1880,7 @@ public function test_concatenate_with_blocking_script_before_and_after_script_wi
18801880
$print_scripts = get_echo( '_print_scripts' );
18811881

18821882
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one-concat-dep-2,two-concat-dep-2,three-concat-dep-2,four-concat-dep-2,five-concat-dep-2,six-concat-dep-2&amp;ver={$wp_version}'></script>\n";
1883-
$expected .= "<script type='text/javascript' src='/main-script.js' id='deferred-script-2-js' defer='defer' data-wp-strategy='defer'></script>\n";
1883+
$expected .= "<script type='text/javascript' src='/main-script.js' id='deferred-script-2-js' defer data-wp-strategy='defer'></script>\n";
18841884

18851885
$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. ' );
18861886
}
@@ -3652,10 +3652,10 @@ public function data_provider_script_move_to_footer() {
36523652
);
36533653
},
36543654
'expected_header' => '
3655-
<script type="text/javascript" src="https://example.com/script-a.js" id="script-a-js" defer="defer" data-wp-strategy="defer"></script>
3655+
<script type="text/javascript" src="https://example.com/script-a.js" id="script-a-js" defer data-wp-strategy="defer"></script>
36563656
',
36573657
'expected_footer' => '
3658-
<script type="text/javascript" src="https://example.com/script-b.js" id="script-b-js" defer="defer" data-wp-strategy="defer"></script>
3658+
<script type="text/javascript" src="https://example.com/script-b.js" id="script-b-js" defer data-wp-strategy="defer"></script>
36593659
',
36603660
'expected_in_footer' => array(
36613661
'script-b',
@@ -3702,12 +3702,12 @@ public function data_provider_script_move_to_footer() {
37023702
);
37033703
},
37043704
'expected_header' => '
3705-
<script type="text/javascript" src="https://example.com/script-a.js" id="script-a-js" defer="defer" data-wp-strategy="defer"></script>
3706-
<script type="text/javascript" src="https://example.com/script-b.js" id="script-b-js" defer="defer" data-wp-strategy="defer"></script>
3705+
<script type="text/javascript" src="https://example.com/script-a.js" id="script-a-js" defer data-wp-strategy="defer"></script>
3706+
<script type="text/javascript" src="https://example.com/script-b.js" id="script-b-js" defer data-wp-strategy="defer"></script>
37073707
',
37083708
'expected_footer' => '
3709-
<script type="text/javascript" src="https://example.com/script-c.js" id="script-c-js" defer="defer" data-wp-strategy="defer"></script>
3710-
<script type="text/javascript" src="https://example.com/script-d.js" id="script-d-js" defer="defer" data-wp-strategy="defer"></script>
3709+
<script type="text/javascript" src="https://example.com/script-c.js" id="script-c-js" defer data-wp-strategy="defer"></script>
3710+
<script type="text/javascript" src="https://example.com/script-d.js" id="script-d-js" defer data-wp-strategy="defer"></script>
37113711
',
37123712
'expected_in_footer' => array(
37133713
'script-c',
@@ -3750,9 +3750,9 @@ public function data_provider_script_move_to_footer() {
37503750
'expected_header' => '',
37513751
'expected_footer' => '
37523752
<script type="text/javascript" src="https://example.com/script-a.js" id="script-a-js" data-wp-strategy="defer"></script>
3753-
<script type="text/javascript" src="https://example.com/script-b.js" id="script-b-js" defer="defer" data-wp-strategy="defer"></script>
3753+
<script type="text/javascript" src="https://example.com/script-b.js" id="script-b-js" defer data-wp-strategy="defer"></script>
37543754
<script type="text/javascript" src="https://example.com/script-c.js" id="script-c-js"></script>
3755-
<script type="text/javascript" src="https://example.com/script-d.js" id="script-d-js" defer="defer" data-wp-strategy="defer"></script>
3755+
<script type="text/javascript" src="https://example.com/script-d.js" id="script-d-js" defer data-wp-strategy="defer"></script>
37563756
',
37573757
'expected_in_footer' => array(
37583758
'script-a',
@@ -3797,11 +3797,11 @@ public function data_provider_script_move_to_footer() {
37973797
},
37983798
'expected_header' => '
37993799
<script type="text/javascript" src="https://example.com/script-a.js" id="script-a-js" data-wp-strategy="defer"></script>
3800-
<script type="text/javascript" src="https://example.com/script-b.js" id="script-b-js" defer="defer" data-wp-strategy="defer"></script>
3800+
<script type="text/javascript" src="https://example.com/script-b.js" id="script-b-js" defer data-wp-strategy="defer"></script>
38013801
',
38023802
'expected_footer' => '
38033803
<script type="text/javascript" src="https://example.com/script-c.js" id="script-c-js"></script>
3804-
<script type="text/javascript" src="https://example.com/script-d.js" id="script-d-js" defer="defer" data-wp-strategy="defer"></script>
3804+
<script type="text/javascript" src="https://example.com/script-d.js" id="script-d-js" defer data-wp-strategy="defer"></script>
38053805
',
38063806
'expected_in_footer' => array(
38073807
'script-c',

0 commit comments

Comments
 (0)