<!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>[54968] trunk/tests/phpunit/tests/http: Built/Test tools, HTTP API: Refactor test for multiple location headers.</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 { white-space: pre-line; 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/54968">54968</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/54968","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-12-14 01:26:39 +0000 (Wed, 14 Dec 2022)</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'>Built/Test tools, HTTP API: Refactor test for multiple location headers.
Remove wordpress.org as an external dependency testing `WP_HTTP::handle_redirects()`.
This refactors and reenables an existing test to call the `WP_HTTP::handle_redirects()` method directly with a mocked array of HTTP headers containing multiple location headers.
The test is moved from the external-http group to the http test group as it no longer makes an HTTP request.
Follow up to <a href="https://core.trac.wordpress.org/changeset/54955">[54955]</a>.
Props SergeyBiryukov, dd32, peterwilsoncc.
Fixes <a href="https://core.trac.wordpress.org/ticket/57306">#57306</a>.
See <a href="https://core.trac.wordpress.org/ticket/56793">#56793</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestshttpbasephp">trunk/tests/phpunit/tests/http/base.php</a></li>
<li><a href="#trunktestsphpunittestshttphttpphp">trunk/tests/phpunit/tests/http/http.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestshttpbasephp"></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/http/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/base.php 2022-12-14 00:22:53 UTC (rev 54967)
+++ trunk/tests/phpunit/tests/http/base.php 2022-12-14 01:26:39 UTC (rev 54968)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,34 +436,6 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Test HTTP Redirects with multiple Location headers specified.
- *
- * This test has been disabled due to api.wordpress.org failing to
- * send two Location headers. See #57306.
- *
- * @ticket 16890
- *
- * @covers ::wp_remote_head
- * @covers ::wp_remote_retrieve_header
- * @covers ::wp_remote_get
- * @covers ::wp_remote_retrieve_body
- */
- public function disabled_test_multiple_location_headers() {
- $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?multiple-location-headers=1';
- $res = wp_remote_head( $url, array( 'timeout' => 30 ) );
-
- $this->skipTestOnTimeout( $res );
- $this->assertIsArray( wp_remote_retrieve_header( $res, 'location' ) );
- $this->assertCount( 2, wp_remote_retrieve_header( $res, 'location' ) );
-
- $res = wp_remote_get( $url, array( 'timeout' => 30 ) );
-
- $this->skipTestOnTimeout( $res );
- $this->assertSame( 'PASS', wp_remote_retrieve_body( $res ) );
-
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Test HTTP Cookie handling.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21182
</span></span></pre></div>
<a id="trunktestsphpunittestshttphttpphp"></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/http/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/http.php 2022-12-14 00:22:53 UTC (rev 54967)
+++ trunk/tests/phpunit/tests/http/http.php 2022-12-14 01:26:39 UTC (rev 54968)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,4 +567,89 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function callback_remove_safe_ports( $ports ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Test HTTP Redirects with multiple Location headers specified.
+ *
+ * Ensure the WP_HTTP::handle_redirects() method handles multiple Location headers
+ * and the HTTP request it makes uses the last Location header.
+ *
+ * @ticket 16890
+ * @ticket 57306
+ *
+ * @covers WP_HTTP::handle_redirects
+ */
+ public function test_multiple_location_headers() {
+ $pre_http_request_filter_has_run = false;
+ // Filter the response made by WP_HTTP::handle_redirects().
+ add_filter(
+ 'pre_http_request',
+ function( $response, $args, $url ) use ( &$pre_http_request_filter_has_run ) {
+ $pre_http_request_filter_has_run = true;
+
+ // Assert the redirect URL is correct.
+ $this->assertSame(
+ $url,
+ 'http://example.com/?multiple-location-headers=1&redirected=two'
+ );
+
+ if ( 'http://example.com/?multiple-location-headers=1&redirected=two' === $url ) {
+ $body = 'PASS';
+ } else {
+ $body = 'FAIL';
+ }
+
+ return array(
+ 'headers' => array(),
+ 'body' => $body,
+ 'response' => array(
+ 'code' => 200,
+ 'message' => 'OK',
+ ),
+ 'cookies' => array(),
+ 'filename' => null,
+ );
+ },
+ 10,
+ 3
+ );
+
+ $headers = array(
+ 'server' => 'nginx',
+ 'date' => 'Sun, 11 Dec 2022 23:11:22 GMT',
+ 'content-type' => 'text/html; charset=utf-8',
+ 'location' => array(
+ 'http://example.com/?multiple-location-headers=1&redirected=one',
+ 'http://example.com/?multiple-location-headers=1&redirected=two',
+ ),
+ );
+
+ // Test the tests: ensure multiple locations are passed to WP_HTTP::handle_redirects().
+ $this->assertIsArray( $headers['location'], 'Location header is expected to be an array.' );
+ $this->assertCount( 2, $headers['location'], 'Location header is expected to contain two values.' );
+
+ $args = array(
+ 'timeout' => 30,
+ '_redirection' => 3,
+ 'redirection' => 2,
+ 'method' => 'GET',
+ );
+
+ $redirect_response = WP_HTTP::handle_redirects(
+ 'http://example.com/?multiple-location-headers=1',
+ $args,
+ array(
+ 'headers' => $headers,
+ 'body' => '',
+ 'cookies' => array(),
+ 'filename' => null,
+ 'response' => array(
+ 'code' => 302,
+ 'message' => 'Found',
+ ),
+ )
+ );
+ $this->assertSame( 'PASS', wp_remote_retrieve_body( $redirect_response ), 'Redirect response body is expected to be PASS.' );
+ $this->assertTrue( $pre_http_request_filter_has_run, 'The pre_http_request filter is expected to run.' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>