sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build/Test Tools: Adjust the test for `wp_redirect()` status codes added in [46641] per the documentation and coding standards. 

Move the test to a more appropriate place for consistency with `wp_sanitize_redirect()` and `wp_validate_redirect()` tests.

See #44317.

git-svn-id: https://develop.svn.wordpress.org/trunk@46649 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-11-04 12:57:17 +00:00
parent c04078ac9d
commit c231bb4869
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/pluggable.php
View File

@ -1251,7 +1251,7 @@ if ( ! function_exists( 'wp_redirect' ) ) :
return false;
}
if ( 300 > $status || 399 < $status ) {
if ( $status < 300 || 399 < $status ) {
wp_die( __( 'HTTP redirect status code must be a redirection code, 3xx.' ) );
}

25
tests/phpunit/tests/formatting/redirect.php
View File

@ -20,6 +20,31 @@ class Tests_Formatting_Redirect extends WP_UnitTestCase {
return 'http://example.com/';
}
/**
* @ticket 44317
*
* @dataProvider get_bad_status_codes
* @expectedException WPDieException
*
* @param string $location The path or URL to redirect to.
* @param int $status HTTP response status code to use.
*/
public function test_wp_redirect_bad_status_code( $location, $status ) {
wp_redirect( $location, $status );
}
public function get_bad_status_codes() {
return array(
// Tests for bad arguments
array( '/wp-admin', 404 ),
array( '/wp-admin', 410 ),
array( '/wp-admin', 500 ),
// Tests for condition.
array( '/wp-admin', 299 ),
array( '/wp-admin', 400 ),
);
}
function test_wp_sanitize_redirect() {
$this->assertEquals( 'http://example.com/watchthelinefeedgo', wp_sanitize_redirect( 'http://example.com/watchthelinefeed%0Ago' ) );
$this->assertEquals( 'http://example.com/watchthelinefeedgo', wp_sanitize_redirect( 'http://example.com/watchthelinefeed%0ago' ) );

24
tests/phpunit/tests/pluggable.php
View File

@ -5,30 +5,6 @@
*/
class Tests_Pluggable extends WP_UnitTestCase {
/**
* @expectedException WPDieException
* @dataProvider get_bad_status_codes
*
* @ticket 44317
* @param string $location The path or URL to redirect to.
* @param int $status HTTP response status code to use.
*/
public function test_wp_redirect_bad_status_code( $location, $status ) {
wp_redirect( $location, $status );
}
public function get_bad_status_codes() {
return [
// Tests for bad arguments
[ '/wp-admin', 404 ],
[ '/wp-admin', 410 ],
[ '/wp-admin', 500 ],
// Tests for condition.
[ '/wp-admin', 299 ],
[ '/wp-admin', 400 ],
];
}
/**
* Tests that the signatures of all functions in pluggable.php match their expected signature.
*