Skip to content

Commit aec1d5c

Browse files
westonruterwestonruter
committed
Fix tests related to head ordering
1 parent 09bb118 commit aec1d5c

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎tests/php/test-class-amp-theme-support.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ static function ( $script ) {
417417
$this->assertStringContains( '<meta name="viewport" content="maximum-scale=1.0,width=device-width">', $sanitized_html );
418418

419419
// MathML script was added.
420-
$this->assertStringContains( '<script type="text/javascript" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js" async custom-element="amp-mathml"></script>', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
420+
$this->assertStringContains( 'https://cdn.ampproject.org/v0/amp-mathml-0.1.js', $sanitized_html ); // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
421421
}
422422

423423
/**
@@ -1640,36 +1640,36 @@ static function ( $url ) {
16401640
$ordered_contains = [
16411641
'<html amp=""',
16421642
'<meta charset="' . Document\Encoding::AMP . '">',
1643-
'<meta name="viewport" content="width=device-width">',
1644-
'<meta name="generator" content="AMP Plugin',
1645-
'<title>',
16461643
'<link rel="preconnect" href="https://cdn.ampproject.org">',
1647-
'<link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin="">',
16481644
'<link rel="dns-prefetch" href="//cdn.ampproject.org">',
1649-
'<link rel="preload" as="script" href="https://cdn.ampproject.org/v0.js">',
16501645
'<link rel="preload" as="script" href="https://cdn.ampproject.org/v0/amp-dynamic-css-classes-0.1.js">',
16511646
'<link rel="preload" as="script" href="https://cdn.ampproject.org/v0/amp-experiment-0.1.js">',
1652-
'<script type="text/javascript" src="https://cdn.ampproject.org/v0.js" async></script>',
1647+
'<meta name="viewport" content="width=device-width">',
1648+
'<link as="script" crossorigin="anonymous" href="https://cdn.ampproject.org/v0.mjs" rel="modulepreload">',
1649+
'<meta name="generator" content="AMP Plugin',
1650+
'<script type="module" src="https://cdn.ampproject.org/v0.mjs" async crossorigin="anonymous"></script>',
16531651

1654-
'<script async custom-element="amp-dynamic-css-classes" src="https://cdn.ampproject.org/v0/amp-dynamic-css-classes-0.1.js"></script>',
1655-
'<script src="https://cdn.ampproject.org/v0/amp-experiment-0.1.js" async="" custom-element="amp-experiment"></script>',
1652+
'<script async custom-element="amp-dynamic-css-classes" src="https://cdn.ampproject.org/v0/amp-dynamic-css-classes-0.1.mjs" type="module" crossorigin="anonymous"></script>',
1653+
'<script src="https://cdn.ampproject.org/v0/amp-experiment-0.1.mjs" async="" custom-element="amp-experiment" type="module" crossorigin="anonymous"></script>',
16561654

1657-
'#<script( type=[\'"]text/javascript[\'"])? src=[\'"]https\://cdn\.ampproject\.org/v0/amp-ad-0\.1\.js[\'"] async(=[\'"][\'"])? custom-element=[\'"]amp-ad[\'"]>\s*</script>#s',
1658-
'#<script src=[\'"]https\://cdn\.ampproject\.org/v0/amp-audio-0\.1\.js[\'"] async(=[\'"][\'"])? custom-element=[\'"]amp-audio[\'"]>\s*</script>#s',
1659-
'<script type="text/javascript" src="https://cdn.ampproject.org/v0/amp-list-0.1.js" async custom-element="amp-list"></script>',
1660-
'<script type="text/javascript" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js" async custom-element="amp-mathml"></script>',
1655+
'<script src="https://cdn.ampproject.org/v0/amp-ad-0.1.mjs" async="" custom-element="amp-ad" type="module" crossorigin="anonymous"></script>',
1656+
'<script src="https://cdn.ampproject.org/v0/amp-audio-0.1.mjs" async="" custom-element="amp-audio" type="module" crossorigin="anonymous"></script>',
1657+
'<script type="module" src="https://cdn.ampproject.org/v0/amp-list-0.1.mjs" async custom-element="amp-list" crossorigin="anonymous"></script>',
1658+
'<script type="module" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.mjs" async custom-element="amp-mathml" crossorigin="anonymous"></script>',
16611659

16621660
'<link rel="icon" href="https://example.org/favicon.png" sizes="32x32">',
16631661
'<link rel="icon" href="https://example.org/favicon.png" sizes="192x192">',
1662+
'<link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin="">',
16641663
'<link crossorigin="anonymous" rel="stylesheet" id="my-font-css" href="https://fonts.googleapis.com/css?family=Tangerine" type="text/css" media="all">',
16651664

16661665
'#<style amp-custom(="")?>.*?body\s*{\s*background:\s*black;?\s*}.*?</style>#s',
16671666

1667+
'<title>',
1668+
'<link rel="canonical" href="',
16681669
'<script type="application/ld+json">{"@context"',
16691670

16701671
'#<style amp-boilerplate(="")?>#',
16711672
'#<noscript><style amp-boilerplate(="")?>#',
1672-
'<link rel="canonical" href="',
16731673
'</head>',
16741674
];
16751675

0 commit comments

Comments
 (0)