<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38447] trunk/tests/phpunit/tests/general/resourceHints.php: Script Loader: Properly adjust tests missed in [38443].</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38447">38447</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38447","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-30 14:50:14 +0000 (Tue, 30 Aug 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Script Loader: Properly adjust tests missed in <a href="https://core.trac.wordpress.org/changeset/38443">[38443]</a>.
See <a href="https://core.trac.wordpress.org/ticket/37800">#37800</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsgeneralresourceHintsphp">trunk/tests/phpunit/tests/general/resourceHints.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsgeneralresourceHintsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/resourceHints.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/resourceHints.php 2016-08-30 14:48:00 UTC (rev 38446)
+++ trunk/tests/phpunit/tests/general/resourceHints.php 2016-08-30 14:50:14 UTC (rev 38447)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_should_have_defaults_on_frontend() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $expected );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,10 +39,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_dns_prefetching() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
- "<link rel='dns-prefetch' href='//wordpress.org'>\n" .
- "<link rel='dns-prefetch' href='//google.com'>\n" .
- "<link rel='dns-prefetch' href='//make.wordpress.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
+ "<link rel='dns-prefetch' href='//wordpress.org' />\n" .
+ "<link rel='dns-prefetch' href='//google.com' />\n" .
+ "<link rel='dns-prefetch' href='//make.wordpress.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_domains' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,11 +70,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37652
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_preconnect() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
- "<link rel='preconnect' href='//wordpress.org'>\n" .
- "<link rel='preconnect' href='https://make.wordpress.org'>\n" .
- "<link rel='preconnect' href='http://google.com'>\n" .
- "<link rel='preconnect' href='http://w.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
+ "<link rel='preconnect' href='//wordpress.org' />\n" .
+ "<link rel='preconnect' href='https://make.wordpress.org' />\n" .
+ "<link rel='preconnect' href='http://google.com' />\n" .
+ "<link rel='preconnect' href='http://w.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_resource_hints', array( $this, '_add_preconnect_domains' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,10 +98,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_prerender() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
- "<link rel='prerender' href='https://make.wordpress.org/great-again'>\n" .
- "<link rel='prerender' href='http://jobs.wordpress.net'>\n" .
- "<link rel='prerender' href='//core.trac.wordpress.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
+ "<link rel='prerender' href='https://make.wordpress.org/great-again' />\n" .
+ "<link rel='prerender' href='http://jobs.wordpress.net' />\n" .
+ "<link rel='prerender' href='//core.trac.wordpress.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_resource_hints', array( $this, '_add_prerender_urls' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,8 +124,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_parse_url_dns_prefetch() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
- "<link rel='dns-prefetch' href='//make.wordpress.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n" .
+ "<link rel='dns-prefetch' href='//make.wordpress.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_long_urls' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,8 +145,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_dns_prefetch_styles() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com'>\n" .
- "<link rel='dns-prefetch' href='//s.w.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com' />\n" .
+ "<link rel='dns-prefetch' href='//s.w.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'family' => 'Open+Sans:400',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,8 +164,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_dns_prefetch_scripts() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com'>\n" .
- "<link rel='dns-prefetch' href='//s.w.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com' />\n" .
+ "<link rel='dns-prefetch' href='//s.w.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'family' => 'Open+Sans:400',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,8 +182,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_dns_prefetch_scripts_does_not_included_registered_only() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n";
- $unexpected = "<link rel='dns-prefetch' href='//wordpress.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
+ $unexpected = "<link rel='dns-prefetch' href='//wordpress.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'jquery-elsewhere', 'https://wordpress.org/wp-includes/js/jquery/jquery.js' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37502
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_deregistered_scripts_are_ignored() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-script', 'http://example.org/script.js' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_deregister_script( 'test-script' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +212,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37652
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_malformed_urls() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<link rel='dns-prefetch' href='//s.w.org' />\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Errant colon.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_errant_colon' ), 10, 2 );
</span></span></pre>
</div>
</div>
</body>
</html>