Changeset 57940 for branches/6.2

Timestamp:

04/07/2024 09:45:23 PM (8 months ago)

Author:

SergeyBiryukov

Message:

Tests: Use an image on WordPress.org CDN in external HTTP tests.

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].

Merges [57931] to the 6.2 branch.

Props peterwilsoncc, jorbin.
See #60865.

Location:

branches/6.2

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/functions/wpRemoteFopen.php (modified) (1 diff)
• tests/phpunit/tests/http/functions.php (modified) (9 diffs)
• tests/phpunit/tests/image/functions.php (modified) (3 diffs)

branches/6.2/tests/phpunit/tests/functions/wpRemoteFopen.php

@@ -27 +27 @@
     public function test_wp_remote_fopen() {
         // This URL gives a direct 200 response.
-        $url      = 'https://asdftestblog1.files.wordpress.com/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 ) );
     }
 }

branches/6.2/tests/phpunit/tests/http/functions.php

@@ -12 +12 @@
     public function test_head_request() {
         // This URL gives a direct 200 response.
-        $url      = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
+        $url      = 'https://s.w.org/screenshots/3.9/dashboard.png';
         $response = wp_remote_head( $url );
 
@@ -21 +21 @@
         $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 ) );
     }
@@ -31 +31 @@
     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 );
 
@@ -42 +42 @@
      */
     public function test_head_404() {
-        $url      = 'https://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg';
+        $url      = 'https://wordpress.org/screenshots/3.9/awefasdfawef.jpg';
         $response = wp_remote_head( $url );
 
@@ -55 +55 @@
      */
     public function test_get_request() {
-        $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
+        $url = 'https://s.w.org/screenshots/3.9/dashboard.png';
 
         $response = wp_remote_get( $url );
@@ -66 +66 @@
 
         // 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 ) );
     }
@@ -77 +77 @@
      */
     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 );
@@ -87 +87 @@
 
         // 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 ) );
     }
@@ -96 +96 @@
      */
     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.

branches/6.2/tests/phpunit/tests/image/functions.php

@@ -539 +539 @@
     public function test_wp_crop_image_with_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,
@@ -547 +547 @@
             100,
             false,
-            DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg'
+            DIR_TESTDATA . '/images/' . __FUNCTION__ . '.png'
         );
 
@@ -588 +588 @@
     public function test_wp_crop_image_should_fail_with_wp_error_object_if_url_does_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,