<!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>[52382] trunk/tests/phpunit/tests: Tests: Mock the HTTP request response in `download_url()` tests.</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/52382">52382</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/52382","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-12-15 19:59:32 +0000 (Wed, 15 Dec 2021)</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'>Tests: Mock the HTTP request response in `download_url()` tests.
This aims to speed up the tests and minimize unrelated failures by avoiding an unnecessary external HTTP request, while still performing the intended functionality checks.
Update similar helpers in some other tests to use more consistent terminology.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/37907">[37907]</a>, <a href="https://core.trac.wordpress.org/changeset/46175">[46175]</a>, <a href="https://core.trac.wordpress.org/changeset/51626">[51626]</a>.
See <a href="https://core.trac.wordpress.org/ticket/54420">#54420</a>, <a href="https://core.trac.wordpress.org/ticket/53363">#53363</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsadminincludesFilephp">trunk/tests/phpunit/tests/admin/includesFile.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsdoEnclosephp">trunk/tests/phpunit/tests/functions/doEnclose.php</a></li>
<li><a href="#trunktestsphpunittestshttpwpGetHttpHeadersphp">trunk/tests/phpunit/tests/http/wpGetHttpHeaders.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsadminincludesFilephp"></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/admin/includesFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesFile.php 2021-12-15 18:06:15 UTC (rev 52381)
+++ trunk/tests/phpunit/tests/admin/includesFile.php 2021-12-15 19:59:32 UTC (rev 52382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,6 +291,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::download_url
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_download_url_no_warning_for_url_without_path() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hook a mocked HTTP request response.
+ add_filter( 'pre_http_request', array( $this, 'mock_http_request' ), 10, 3 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = download_url( 'https://example.com' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,6 +309,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::download_url
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_download_url_no_warning_for_url_without_path_with_signature_verification() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hook a mocked HTTP request response.
+ add_filter( 'pre_http_request', array( $this, 'mock_http_request' ), 10, 3 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_signature_hosts',
</span><span class="cx" style="display: block; padding: 0 10px"> static function( $urls ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,4 +332,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertWPError( $error );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'signature_verification_no_signature', $error->get_error_code() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Mock the HTTP request response.
+ *
+ * @param bool $false False.
+ * @param array $arguments Request arguments.
+ * @param string $url Request URL.
+ * @return array|bool
+ */
+ public function mock_http_request( $false, $arguments, $url ) {
+ if ( 'https://example.com' === $url ) {
+ return array(
+ 'response' => array(
+ 'code' => 200,
+ ),
+ );
+ }
+
+ return $false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionsdoEnclosephp"></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/doEnclose.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/doEnclose.php 2021-12-15 18:06:15 UTC (rev 52381)
+++ trunk/tests/phpunit/tests/functions/doEnclose.php 2021-12-15 19:59:32 UTC (rev 52382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_up() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'pre_http_request', array( $this, 'fake_http_request' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'pre_http_request', array( $this, 'mock_http_request' ), 10, 3 );
</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">@@ -250,7 +250,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fake the HTTP request response.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Mock the HTTP request response.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,10 +257,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $false False.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $arguments Request arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url Request URL.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array Header.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function fake_http_request( $false, $arguments, $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function mock_http_request( $false, $arguments, $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Video and audio headers.
</span><span class="cx" style="display: block; padding: 0 10px"> $fake_headers = array(
</span></span></pre></div>
<a id="trunktestsphpunittestshttpwpGetHttpHeadersphp"></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/wpGetHttpHeaders.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/wpGetHttpHeaders.php 2021-12-15 18:06:15 UTC (rev 52381)
+++ trunk/tests/phpunit/tests/http/wpGetHttpHeaders.php 2021-12-15 19:59:32 UTC (rev 52382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,8 +12,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_up() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Hook a fake HTTP request response.
- add_filter( 'pre_http_request', array( $this, 'fake_http_request' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hook a mocked HTTP request response.
+ add_filter( 'pre_http_request', array( $this, 'mock_http_request' ), 10, 3 );
</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">@@ -47,10 +47,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $false False.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $arguments Request arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url Request URL.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array|bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function fake_http_request( $false, $arguments, $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function mock_http_request( $false, $arguments, $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'http://example.com' === $url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'headers' => true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>