<!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>[36717] trunk/tests/phpunit/tests: Correct some more tests which were using `example.org` instead of `WP_TESTS_DOMAIN`.</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/36717">36717</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/36717","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-26 00:25:10 +0000 (Fri, 26 Feb 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'>Correct some more tests which were using `example.org` instead of `WP_TESTS_DOMAIN`.
See <a href="https://core.trac.wordpress.org/ticket/34000">#34000</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionsrefererphp">trunk/tests/phpunit/tests/functions/referer.php</a></li>
<li><a href="#trunktestsphpunittestsrewritenumericSlugsphp">trunk/tests/phpunit/tests/rewrite/numericSlugs.php</a></li>
<li><a href="#trunktestsphpunittestsuploadphp">trunk/tests/phpunit/tests/upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionsrefererphp"></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/functions/referer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/referer.php 2016-02-26 00:20:54 UTC (rev 36716)
+++ trunk/tests/phpunit/tests/functions/referer.php 2016-02-26 00:25:10 UTC (rev 36717)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,11 +23,11 @@
</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"> public function _fake_subfolder_install() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 'http://example.org/subfolder';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'http://' . WP_TESTS_DOMAIN . '/subfolder';
</ins><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"> public function filter_allowed_redirect_hosts( $hosts ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $hosts[] = 'another.example.org';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hosts[] = 'another.' . WP_TESTS_DOMAIN;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $hosts;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,21 +39,21 @@
</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"> public function test_from_request_same_url() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/test.php?id=123' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://' . WP_TESTS_DOMAIN . '/test.php?id=123' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_referer() );
</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"> public function test_from_request_different_resource() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/another.php?id=123' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://' . WP_TESTS_DOMAIN . '/another.php?id=123' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'http://example.org/another.php?id=123', wp_get_referer() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'http://' . WP_TESTS_DOMAIN . '/another.php?id=123', wp_get_referer() );
</ins><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"> public function test_from_request_different_query_args() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/test.php?another=555' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://' . WP_TESTS_DOMAIN . '/test.php?another=555' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'http://example.org/test.php?another=555', wp_get_referer() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'http://' . WP_TESTS_DOMAIN . '/test.php?another=555', wp_get_referer() );
</ins><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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_from_request_subfolder_install() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'site_url', array( $this, '_fake_subfolder_install' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/subfolder/test.php?id=123' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://' . WP_TESTS_DOMAIN . '/subfolder/test.php?id=123' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = addslashes( '/subfolder/test.php?id=123' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_referer() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,9 +75,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_from_request_subfolder_install_different_resource() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'site_url', array( $this, '_fake_subfolder_install' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_REQUEST['_wp_http_referer'] = addslashes( 'http://example.org/subfolder/another.php?id=123' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_REQUEST['_wp_http_referer'] = addslashes( 'http://' . WP_TESTS_DOMAIN . '/subfolder/another.php?id=123' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = addslashes( '/subfolder/test.php?id=123' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'http://example.org/subfolder/another.php?id=123', wp_get_referer() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'http://' . WP_TESTS_DOMAIN . '/subfolder/another.php?id=123', wp_get_referer() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'site_url', array( $this, '_fake_subfolder_install' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,15 +89,15 @@
</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"> public function test_same_url() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_SERVER['HTTP_REFERER'] = addslashes( 'http://example.org/test.php?id=123' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_SERVER['HTTP_REFERER'] = addslashes( 'http://' . WP_TESTS_DOMAIN . '/test.php?id=123' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_referer() );
</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"> public function test_different_resource() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_SERVER['HTTP_REFERER'] = addslashes( 'http://example.org/another.php?id=123' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_SERVER['HTTP_REFERER'] = addslashes( 'http://' . WP_TESTS_DOMAIN . '/another.php?id=123' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'http://example.org/another.php?id=123', wp_get_referer() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'http://' . WP_TESTS_DOMAIN . '/another.php?id=123', wp_get_referer() );
</ins><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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27152
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_different_server() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_SERVER['HTTP_REFERER'] = addslashes( 'http://another.example.org/test.php?id=123' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_SERVER['HTTP_REFERER'] = addslashes( 'http://another.' . WP_TESTS_DOMAIN . '/test.php?id=123' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_get_referer() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,9 +116,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_different_server_allowed_redirect_host() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'allowed_redirect_hosts', array( $this, 'filter_allowed_redirect_hosts' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_SERVER['HTTP_REFERER'] = addslashes( 'http://another.example.org/test.php?id=123' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_SERVER['HTTP_REFERER'] = addslashes( 'http://another.' . WP_TESTS_DOMAIN . '/test.php?id=123' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = addslashes( '/test.php?id=123' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'http://another.example.org/test.php?id=123', wp_get_referer() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'http://another.' . WP_TESTS_DOMAIN . '/test.php?id=123', wp_get_referer() );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'allowed_redirect_hosts', array( $this, 'filter_allowed_redirect_hosts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrewritenumericSlugsphp"></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/rewrite/numericSlugs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/numericSlugs.php 2016-02-26 00:20:54 UTC (rev 36716)
+++ trunk/tests/phpunit/tests/rewrite/numericSlugs.php 2016-02-26 00:25:10 UTC (rev 36717)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->posts,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => '2015',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'guid' => 'http://example.org/?p=2015'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'guid' => 'http://' . WP_TESTS_DOMAIN . '/?p=2015'
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'ID' => $id )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->posts,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => '2015',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'guid' => 'http://example.org/?p=2015'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'guid' => 'http://' . WP_TESTS_DOMAIN . '/?p=2015'
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'ID' => $id )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestsuploadphp"></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/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/upload.php 2016-02-26 00:20:54 UTC (rev 36716)
+++ trunk/tests/phpunit/tests/upload.php 2016-02-26 00:25:10 UTC (rev 36717)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,14 +82,14 @@
</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_upload_path_absolute() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'upload_url_path', 'http://example.org/asdf' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'upload_url_path', 'http://' . WP_TESTS_DOMAIN . '/asdf' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use `_wp_upload_dir()` directly to bypass caching and work with the changed options.
</span><span class="cx" style="display: block; padding: 0 10px"> // It doesn't create the /year/month directories.
</span><span class="cx" style="display: block; padding: 0 10px"> $info = _wp_upload_dir();
</span><span class="cx" style="display: block; padding: 0 10px"> $subdir = gmstrftime('/%Y/%m');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'http://example.org/asdf' . $subdir, $info['url'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'http://' . WP_TESTS_DOMAIN . '/asdf' . $subdir, $info['url'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $subdir, $info['subdir'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( false, $info['error'] );
</span></span></pre>
</div>
</div>
</body>
</html>