Skip to content

Commit

Permalink
Tests: Use an image on WordPress.org CDN in external HTTP tests.
Browse files Browse the repository at this point in the history
Due to some changes on the WP.com side to compress the requested images on the fly, the exact image size in the response could be different between platforms.

This commit aims to make the affected tests more reliable.

Follow-up to [139/tests], [31258], [34568], [47142], [57903], [57904], [57924].

Props peterwilsoncc, jorbin.
See #60865.

git-svn-id: https://develop.svn.wordpress.org/trunk@57931 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
SergeyBiryukov committed Apr 5, 2024
1 parent ea7888f commit 13fd2f8
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions tests/phpunit/tests/functions/wpRemoteFopen.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ public function test_wp_remote_fopen_bad_url() {
*/
public function test_wp_remote_fopen() {
// This URL gives a direct 200 response.
$url = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/2007-06-30-dsc_4700-1.jpg';
$url = 'https://s.w.org/screenshots/3.9/dashboard.png';
$response = wp_remote_fopen( $url );

$this->assertIsString( $response );
$this->assertSame( 40148, strlen( $response ) );
$this->assertSame( 153204, strlen( $response ) );
}
}
28 changes: 14 additions & 14 deletions tests/phpunit/tests/http/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Tests_HTTP_Functions extends WP_UnitTestCase {
*/
public function test_head_request() {
// This URL gives a direct 200 response.
$url = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/2007-06-30-dsc_4700-1.jpg';
$url = 'https://s.w.org/screenshots/3.9/dashboard.png';
$response = wp_remote_head( $url );

$this->skipTestOnTimeout( $response );
Expand All @@ -20,8 +20,8 @@ public function test_head_request() {

$this->assertIsArray( $response );

$this->assertSame( 'image/jpeg', $headers['Content-Type'] );
$this->assertSame( '40148', $headers['Content-Length'] );
$this->assertSame( 'image/png', $headers['Content-Type'] );
$this->assertSame( '153204', $headers['Content-Length'] );
$this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
}

Expand All @@ -30,7 +30,7 @@ public function test_head_request() {
*/
public function test_head_redirect() {
// This URL will 301 redirect.
$url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
$url = 'https://wp.org/screenshots/3.9/dashboard.png';
$response = wp_remote_head( $url );

$this->skipTestOnTimeout( $response );
Expand All @@ -41,7 +41,7 @@ public function test_head_redirect() {
* @covers ::wp_remote_head
*/
public function test_head_404() {
$url = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/awefasdfawef.jpg';
$url = 'https://wordpress.org/screenshots/3.9/awefasdfawef.jpg';
$response = wp_remote_head( $url );

$this->skipTestOnTimeout( $response );
Expand All @@ -54,7 +54,7 @@ public function test_head_404() {
* @covers ::wp_remote_retrieve_response_code
*/
public function test_get_request() {
$url = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/2007-06-30-dsc_4700-1.jpg';
$url = 'https://s.w.org/screenshots/3.9/dashboard.png';

$response = wp_remote_get( $url );

Expand All @@ -65,8 +65,8 @@ public function test_get_request() {
$this->assertIsArray( $response );

// Should return the same headers as a HEAD request.
$this->assertSame( 'image/jpeg', $headers['Content-Type'] );
$this->assertSame( '40148', $headers['Content-Length'] );
$this->assertSame( 'image/png', $headers['Content-Type'] );
$this->assertSame( '153204', $headers['Content-Length'] );
$this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
}

Expand All @@ -76,8 +76,8 @@ public function test_get_request() {
* @covers ::wp_remote_retrieve_response_code
*/
public function test_get_redirect() {
// This will redirect to asdftestblog1.files.wordpress.com.
$url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
// This will redirect to wordpress.org.
$url = 'https://wp.org/screenshots/3.9/dashboard.png';

$response = wp_remote_get( $url );

Expand All @@ -86,17 +86,17 @@ public function test_get_redirect() {
$headers = wp_remote_retrieve_headers( $response );

// Should return the same headers as a HEAD request.
$this->assertSame( 'image/jpeg', $headers['Content-Type'] );
$this->assertSame( '40148', $headers['Content-Length'] );
$this->assertSame( 'image/png', $headers['Content-Type'] );
$this->assertSame( '153204', $headers['Content-Length'] );
$this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
}

/**
* @covers ::wp_remote_get
*/
public function test_get_redirect_limit_exceeded() {
// This will redirect to asdftestblog1.files.wordpress.com.
$url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
// This will redirect to wordpress.org.
$url = 'https://wp.org/screenshots/3.9/dashboard.png';

// Pretend we've already redirected 5 times.
$response = wp_remote_get( $url, array( 'redirection' => -1 ) );
Expand Down
6 changes: 3 additions & 3 deletions tests/phpunit/tests/image/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -638,15 +638,15 @@ public function test_wp_crop_image_with_file() {
*/
public function test_wp_crop_image_with_url() {
$file = wp_crop_image(
'https://asdftestblog1.wordpress.com/wp-content/uploads/2008/04/canola.jpg',
'https://s.w.org/screenshots/3.9/dashboard.png',
0,
0,
100,
100,
100,
100,
false,
DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg'
DIR_TESTDATA . '/images/' . __FUNCTION__ . '.png'
);

if ( is_wp_error( $file ) && $file->get_error_code() === 'invalid_image' ) {
Expand Down Expand Up @@ -687,7 +687,7 @@ public function test_wp_crop_image_should_fail_with_wp_error_object_if_file_does
*/
public function test_wp_crop_image_should_fail_with_wp_error_object_if_url_does_not_exist() {
$file = wp_crop_image(
'https://asdftestblog1.wordpress.com/wp-content/uploads/2008/04/canoladoesnotexist.jpg',
'https://wordpress.org/screenshots/3.9/canoladoesnotexist.jpg',
0,
0,
100,
Expand Down

0 comments on commit 13fd2f8

Please sign in to comment.