Make WordPress Core

Changeset 57935


Ignore:
Timestamp:
04/06/2024 02:19:35 PM (2 years 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].

Reviewed by jorbin.
Merges [57931] to the 6.5 branch.

Props peterwilsoncc, jorbin.
See #60865.

Location:
branches/6.5
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/6.5

  • branches/6.5/tests/phpunit/tests/functions/wpRemoteFopen.php

    r57908 r57935  
    2828        public function test_wp_remote_fopen() {
    2929                // This URL gives a direct 200 response.
    30                 $url      = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/2007-06-30-dsc_4700-1.jpg';
     30                $url      = 'https://s.w.org/screenshots/3.9/dashboard.png';
    3131                $response = wp_remote_fopen( $url );
    3232
    3333                $this->assertIsString( $response );
    34                 $this->assertSame( 40148, strlen( $response ) );
     34                $this->assertSame( 153204, strlen( $response ) );
    3535        }
    3636}
  • branches/6.5/tests/phpunit/tests/http/functions.php

    r57908 r57935  
    1212        public function test_head_request() {
    1313                // This URL gives a direct 200 response.
    14                 $url      = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/2007-06-30-dsc_4700-1.jpg';
     14                $url      = 'https://s.w.org/screenshots/3.9/dashboard.png';
    1515                $response = wp_remote_head( $url );
    1616
     
    2121                $this->assertIsArray( $response );
    2222
    23                 $this->assertSame( 'image/jpeg', $headers['Content-Type'] );
    24                 $this->assertSame( '40148', $headers['Content-Length'] );
     23                $this->assertSame( 'image/png', $headers['Content-Type'] );
     24                $this->assertSame( '153204', $headers['Content-Length'] );
    2525                $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
    2626        }
     
    3131        public function test_head_redirect() {
    3232                // This URL will 301 redirect.
    33                 $url      = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
     33                $url      = 'https://wp.org/screenshots/3.9/dashboard.png';
    3434                $response = wp_remote_head( $url );
    3535
     
    4242         */
    4343        public function test_head_404() {
    44                 $url      = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/awefasdfawef.jpg';
     44                $url      = 'https://wordpress.org/screenshots/3.9/awefasdfawef.jpg';
    4545                $response = wp_remote_head( $url );
    4646
     
    5555         */
    5656        public function test_get_request() {
    57                 $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
     57                $url = 'https://s.w.org/screenshots/3.9/dashboard.png';
    5858
    5959                $response = wp_remote_get( $url );
     
    6666
    6767                // Should return the same headers as a HEAD request.
    68                 $this->assertSame( 'image/jpeg', $headers['Content-Type'] );
    69                 $this->assertSame( '40148', $headers['Content-Length'] );
     68                $this->assertSame( 'image/png', $headers['Content-Type'] );
     69                $this->assertSame( '153204', $headers['Content-Length'] );
    7070                $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
    7171        }
     
    7777         */
    7878        public function test_get_redirect() {
    79                 // This will redirect to asdftestblog1.files.wordpress.com.
    80                 $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
     79                // This will redirect to wordpress.org.
     80                $url = 'https://wp.org/screenshots/3.9/dashboard.png';
    8181
    8282                $response = wp_remote_get( $url );
     
    8787
    8888                // Should return the same headers as a HEAD request.
    89                 $this->assertSame( 'image/jpeg', $headers['Content-Type'] );
    90                 $this->assertSame( '40148', $headers['Content-Length'] );
     89                $this->assertSame( 'image/png', $headers['Content-Type'] );
     90                $this->assertSame( '153204', $headers['Content-Length'] );
    9191                $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
    9292        }
     
    9696         */
    9797        public function test_get_redirect_limit_exceeded() {
    98                 // This will redirect to asdftestblog1.files.wordpress.com.
    99                 $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
     98                // This will redirect to wordpress.org.
     99                $url = 'https://wp.org/screenshots/3.9/dashboard.png';
    100100
    101101                // Pretend we've already redirected 5 times.
  • branches/6.5/tests/phpunit/tests/image/functions.php

    r57524 r57935  
    639639        public function test_wp_crop_image_with_url() {
    640640                $file = wp_crop_image(
    641                         'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
     641                        'https://s.w.org/screenshots/3.9/dashboard.png',
    642642                        0,
    643643                        0,
     
    647647                        100,
    648648                        false,
    649                         DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg'
     649                        DIR_TESTDATA . '/images/' . __FUNCTION__ . '.png'
    650650                );
    651651
     
    688688        public function test_wp_crop_image_should_fail_with_wp_error_object_if_url_does_not_exist() {
    689689                $file = wp_crop_image(
    690                         'https://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
     690                        'https://wordpress.org/screenshots/3.9/canoladoesnotexist.jpg',
    691691                        0,
    692692                        0,
Note: See TracChangeset for help on using the changeset viewer.