diff --git a/tests/phpunit/tests/http/functions.php b/tests/phpunit/tests/http/functions.php index f08e272922017..50dc04d6697ec 100644 --- a/tests/phpunit/tests/http/functions.php +++ b/tests/phpunit/tests/http/functions.php @@ -14,9 +14,12 @@ public function setUp() { parent::setUp(); } - function test_head_request() { - // this url give a direct 200 response - $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg'; + /** + * @covers ::wp_remote_head + */ + public function test_head_request() { + // This URL gives a direct 200 response. + $url = 'https://s.w.org/screenshots/3.9/dashboard.png'; $response = wp_remote_head( $url ); $this->skipTestOnTimeout( $response ); @@ -25,30 +28,38 @@ function test_head_request() { $this->assertInternalType( 'array', $response ); - $this->assertEquals( 'image/jpeg', $headers['content-type'] ); - $this->assertEquals( '40148', $headers['content-length'] ); - $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) ); + $this->assertSame( 'image/png', $headers['Content-Type'] ); + $this->assertSame( '153204', $headers['Content-Length'] ); + $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) ); } 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 ); $this->assertEquals( '301', wp_remote_retrieve_response_code( $response ) ); } - function test_head_404() { - $url = 'https://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg'; + /** + * @covers ::wp_remote_head + */ + public function test_head_404() { + $url = 'https://wordpress.org/screenshots/3.9/awefasdfawef.jpg'; $response = wp_remote_head( $url ); $this->skipTestOnTimeout( $response ); $this->assertEquals( '404', wp_remote_retrieve_response_code( $response ) ); } - function test_get_request() { - $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg'; + /** + * @covers ::wp_remote_get + * @covers ::wp_remote_retrieve_headers + * @covers ::wp_remote_retrieve_response_code + */ + public function test_get_request() { + $url = 'https://s.w.org/screenshots/3.9/dashboard.png'; $response = wp_remote_get( $url ); @@ -58,15 +69,20 @@ function test_get_request() { $this->assertInternalType( 'array', $response ); - // should return the same headers as a head request - $this->assertEquals( 'image/jpeg', $headers['content-type'] ); - $this->assertEquals( '40148', $headers['content-length'] ); - $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) ); + // Should return the same headers as a HEAD request. + $this->assertSame( 'image/png', $headers['Content-Type'] ); + $this->assertSame( '153204', $headers['Content-Length'] ); + $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) ); } - 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'; + /** + * @covers ::wp_remote_get + * @covers ::wp_remote_retrieve_headers + * @covers ::wp_remote_retrieve_response_code + */ + public function test_get_redirect() { + // This will redirect to wordpress.org. + $url = 'https://wp.org/screenshots/3.9/dashboard.png'; $response = wp_remote_get( $url ); @@ -74,15 +90,18 @@ function test_get_redirect() { $headers = wp_remote_retrieve_headers( $response ); - // should return the same headers as a head request - $this->assertEquals( 'image/jpeg', $headers['content-type'] ); - $this->assertEquals( '40148', $headers['content-length'] ); - $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) ); + // Should return the same headers as a HEAD request. + $this->assertSame( 'image/png', $headers['Content-Type'] ); + $this->assertSame( '153204', $headers['Content-Length'] ); + $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) ); } - 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'; + /** + * @covers ::wp_remote_get + */ + public function test_get_redirect_limit_exceeded() { + // 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 ) ); diff --git a/tests/phpunit/tests/image/functions.php b/tests/phpunit/tests/image/functions.php index d763e4d0e4de5..a46678c3fb710 100644 --- a/tests/phpunit/tests/image/functions.php +++ b/tests/phpunit/tests/image/functions.php @@ -335,7 +335,7 @@ public function test_wp_crop_image_url() { } $file = wp_crop_image( - 'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg', + 'https://s.w.org/screenshots/3.9/dashboard.png', 0, 0, 100, @@ -343,7 +343,7 @@ public function test_wp_crop_image_url() { 100, 100, false, - DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg' + DIR_TESTDATA . '/images/' . __FUNCTION__ . '.png' ); $this->assertNotWPError( $file ); $this->assertFileExists( $file ); @@ -374,7 +374,7 @@ public function test_wp_crop_image_url_not_exist() { } $file = wp_crop_image( - 'https://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg', + 'https://wordpress.org/screenshots/3.9/canoladoesnotexist.jpg', 0, 0, 100,