Changeset 64042

Timestamp:

10/01/2026 09:48:59 PM (4 days ago)

Author:

lancewillett

Message:

Tests: Improve isolation for media tests.

Reset loading-optimization state before each media test, accept valid generated caption-ID suffixes, and derive expected attachment filenames from the uploaded files. Restore the incoming HTTPS server value after attachment tests.

Group the remote image-cropping test under external-http, preserving its remote-fetch coverage while keeping it out of the default test run.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/13190

Props jonsurrell, adrianmoldovanwp.
See #65893.

Location:

trunk/tests/phpunit/tests

Files:

• image/functions.php (modified) (1 diff)
• media.php (modified) (2 diffs)
• post/attachments.php (modified) (4 diffs)

trunk/tests/phpunit/tests/image/functions.php

@@ -668 +668 @@
         /**
          * @covers ::wp_crop_image
+         * @group external-http
          * @requires function imagejpeg
          * @requires extension openssl

trunk/tests/phpunit/tests/media.php

@@ -77 +77 @@
                 $wp_styles                = null;
                 parent::set_up();
+
+                $this->reset_content_media_count();
+                $this->reset_omit_loading_attr_filter();
+                $this->reset_high_priority_element_flag();
         }
 
@@ -270 +274 @@
                 );
                 $this->assertSame( 1, substr_count( $result, 'wp-caption &myAlignment' ) );
-                $this->assertSame( 1, preg_match( '/id="myId(?:[0-9]+)?"/', $result ) );
+                $this->assertSame( 1, preg_match( '/id="myId(?:-[0-9]+)?"/', $result ) );
                 $this->assertSame( 1, substr_count( $result, self::CAPTION ) );
         }

trunk/tests/phpunit/tests/post/attachments.php

@@ -8 +8 @@
 class Tests_Post_Attachments extends WP_UnitTestCase {
 
+        /**
+         * Original HTTPS value.
+         *
+         * @var string|null
+         */
+        private $original_https;
+
+        public function set_up() {
+                parent::set_up();
+
+                $this->original_https = $_SERVER['HTTPS'] ?? null;
+        }
+
         public function tear_down() {
                 // Remove all uploads.
                 $this->remove_added_uploads();
+
+                if ( null === $this->original_https ) {
+                        unset( $_SERVER['HTTPS'] );
+                } else {
+                        $_SERVER['HTTPS'] = $this->original_https;
+                }
+
                 parent::tear_down();
         }
@@ -122 +142 @@
                 $this->assertEmpty( $upload['error'] );
 
-                $id      = $this->_make_attachment( $upload );
-                $uploads = wp_upload_dir();
+                $id            = $this->_make_attachment( $upload );
+                $uploads       = wp_upload_dir();
+                $filename_base = wp_basename( $upload['file'], '.jpg' );
 
                 // Intermediate copies should exist: thumbnail and medium.
                 $thumb = image_get_intermediate_size( $id, 'thumbnail' );
-                $this->assertSame( '2007-06-17DSC_4173-150x150.jpg', $thumb['file'] );
+                $this->assertSame( $filename_base . '-150x150.jpg', $thumb['file'] );
                 $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $thumb['path'] ) );
 
                 $medium = image_get_intermediate_size( $id, 'medium' );
-                $this->assertSame( '2007-06-17DSC_4173-400x602.jpg', $medium['file'] );
+                $this->assertSame( $filename_base . '-400x602.jpg', $medium['file'] );
                 $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $medium['path'] ) );
 
                 $medium_large = image_get_intermediate_size( $id, 'medium_large' );
-                $this->assertSame( '2007-06-17DSC_4173-600x904.jpg', $medium_large['file'] );
+                $this->assertSame( $filename_base . '-600x904.jpg', $medium_large['file'] );
                 $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $medium_large['path'] ) );
 
@@ -143 +164 @@
                 // image_downsize() should return the correct images and sizes.
                 $downsize = image_downsize( $id, 'thumbnail' );
-                $this->assertSame( '2007-06-17DSC_4173-150x150.jpg', wp_basename( $downsize[0] ) );
+                $this->assertSame( $filename_base . '-150x150.jpg', wp_basename( $downsize[0] ) );
                 $this->assertSame( 150, $downsize[1] );
                 $this->assertSame( 150, $downsize[2] );
 
                 $downsize = image_downsize( $id, 'medium' );
-                $this->assertSame( '2007-06-17DSC_4173-400x602.jpg', wp_basename( $downsize[0] ) );
+                $this->assertSame( $filename_base . '-400x602.jpg', wp_basename( $downsize[0] ) );
                 $this->assertSame( 400, $downsize[1] );
                 $this->assertSame( 602, $downsize[2] );
 
                 $downsize = image_downsize( $id, 'medium_large' );
-                $this->assertSame( '2007-06-17DSC_4173-600x904.jpg', wp_basename( $downsize[0] ) );
+                $this->assertSame( $filename_base . '-600x904.jpg', wp_basename( $downsize[0] ) );
                 $this->assertSame( 600, $downsize[1] );
                 $this->assertSame( 904, $downsize[2] );
 
                 $downsize = image_downsize( $id, 'full' );
-                $this->assertSame( '2007-06-17DSC_4173.jpg', wp_basename( $downsize[0] ) );
+                $this->assertSame( $filename_base . '.jpg', wp_basename( $downsize[0] ) );
                 $this->assertSame( 680, $downsize[1] );
                 $this->assertSame( 1024, $downsize[2] );
@@ -179 +200 @@
                 $this->assertEmpty( $upload['error'] );
 
-                $id      = $this->_make_attachment( $upload );
-                $uploads = wp_upload_dir();
+                $id            = $this->_make_attachment( $upload );
+                $uploads       = wp_upload_dir();
+                $filename_base = wp_basename( $upload['file'], '.jpg' );
 
                 // Check that the file and intermediates exist.
                 $thumb = image_get_intermediate_size( $id, 'thumbnail' );
-                $this->assertSame( '2007-06-17DSC_4173-150x150.jpg', $thumb['file'] );
+                $this->assertSame( $filename_base . '-150x150.jpg', $thumb['file'] );
                 $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $thumb['path'] ) );
 
                 $medium = image_get_intermediate_size( $id, 'medium' );
-                $this->assertSame( '2007-06-17DSC_4173-400x602.jpg', $medium['file'] );
+                $this->assertSame( $filename_base . '-400x602.jpg', $medium['file'] );
                 $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $medium['path'] ) );
 
                 $medium_large = image_get_intermediate_size( $id, 'medium_large' );
-                $this->assertSame( '2007-06-17DSC_4173-600x904.jpg', $medium_large['file'] );
+                $this->assertSame( $filename_base . '-600x904.jpg', $medium_large['file'] );
                 $this->assertTrue( is_file( $uploads['basedir'] . DIRECTORY_SEPARATOR . $medium_large['path'] ) );