Skip to content

Commit edcc32c

Browse files
committed
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 [54955]. Props SergeyBiryukov, dd32, peterwilsoncc. Merges [54968] to the 5.3 branch. Fixes #57306. See #56793. git-svn-id: https://develop.svn.wordpress.org/branches/5.3@54982 602fd350-edb4-49c9-b593-d223f7449a82
1 parent e51cf19 commit edcc32c

File tree

2 files changed

+84
-20
lines changed

2 files changed

+84
-20
lines changed

tests/phpunit/tests/http/base.php

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -393,26 +393,6 @@ function test_https_url_without_ssl_verification() {
393393
$this->assertNotWPError( $res );
394394
}
395395

396-
/**
397-
* Test HTTP Redirects with multiple Location headers specified
398-
*
399-
* @ticket 16890
400-
*/
401-
function test_multiple_location_headers() {
402-
$url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?multiple-location-headers=1';
403-
$res = wp_remote_head( $url, array( 'timeout' => 30 ) );
404-
405-
$this->skipTestOnTimeout( $res );
406-
$this->assertInternalType( 'array', wp_remote_retrieve_header( $res, 'location' ) );
407-
$this->assertCount( 2, wp_remote_retrieve_header( $res, 'location' ) );
408-
409-
$res = wp_remote_get( $url, array( 'timeout' => 30 ) );
410-
411-
$this->skipTestOnTimeout( $res );
412-
$this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
413-
414-
}
415-
416396
/**
417397
* Test HTTP Cookie handling
418398
*

tests/phpunit/tests/http/http.php

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,4 +372,88 @@ function wp_translate_php_url_constant_to_key_testcases() {
372372
);
373373
}
374374

375+
/**
376+
* Test HTTP Redirects with multiple Location headers specified.
377+
*
378+
* Ensure the WP_HTTP::handle_redirects() method handles multiple Location headers
379+
* and the HTTP request it makes uses the last Location header.
380+
*
381+
* @ticket 16890
382+
* @ticket 57306
383+
*
384+
* @covers WP_HTTP::handle_redirects
385+
*/
386+
public function test_multiple_location_headers() {
387+
$pre_http_request_filter_has_run = false;
388+
// Filter the response made by WP_HTTP::handle_redirects().
389+
add_filter(
390+
'pre_http_request',
391+
function( $response, $args, $url ) use ( &$pre_http_request_filter_has_run ) {
392+
$pre_http_request_filter_has_run = true;
393+
394+
// Assert the redirect URL is correct.
395+
$this->assertSame(
396+
$url,
397+
'http://example.com/?multiple-location-headers=1&redirected=two'
398+
);
399+
400+
if ( 'http://example.com/?multiple-location-headers=1&redirected=two' === $url ) {
401+
$body = 'PASS';
402+
} else {
403+
$body = 'FAIL';
404+
}
405+
406+
return array(
407+
'headers' => array(),
408+
'body' => $body,
409+
'response' => array(
410+
'code' => 200,
411+
'message' => 'OK',
412+
),
413+
'cookies' => array(),
414+
'filename' => null,
415+
);
416+
},
417+
10,
418+
3
419+
);
420+
421+
$headers = array(
422+
'server' => 'nginx',
423+
'date' => 'Sun, 11 Dec 2022 23:11:22 GMT',
424+
'content-type' => 'text/html; charset=utf-8',
425+
'location' => array(
426+
'http://example.com/?multiple-location-headers=1&redirected=one',
427+
'http://example.com/?multiple-location-headers=1&redirected=two',
428+
),
429+
);
430+
431+
// Test the tests: ensure multiple locations are passed to WP_HTTP::handle_redirects().
432+
$this->assertIsArray( $headers['location'], 'Location header is expected to be an array.' );
433+
$this->assertCount( 2, $headers['location'], 'Location header is expected to contain two values.' );
434+
435+
$args = array(
436+
'timeout' => 30,
437+
'_redirection' => 3,
438+
'redirection' => 2,
439+
'method' => 'GET',
440+
);
441+
442+
$redirect_response = WP_HTTP::handle_redirects(
443+
'http://example.com/?multiple-location-headers=1',
444+
$args,
445+
array(
446+
'headers' => $headers,
447+
'body' => '',
448+
'cookies' => array(),
449+
'filename' => null,
450+
'response' => array(
451+
'code' => 302,
452+
'message' => 'Found',
453+
),
454+
)
455+
);
456+
$this->assertSame( 'PASS', wp_remote_retrieve_body( $redirect_response ), 'Redirect response body is expected to be PASS.' );
457+
$this->assertTrue( $pre_http_request_filter_has_run, 'The pre_http_request filter is expected to run.' );
458+
}
375459
}

0 commit comments

Comments
 (0)