Changeset 53920

Timestamp:

08/22/2022 07:50:15 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Clean up test image before performing assertions in image tests.

This makes sure there are no leftover images in case of a test failure.

Applies to: test_wp_calculate_image_srcset_no_date_uploads().

Includes renaming the $int variable to $int_size for consistency with some other tests.

Follow-up to [34855], [35412], [35751], [53463].

See #55652.

File:

• trunk/tests/phpunit/tests/media.php (modified) (4 diffs)

trunk/tests/phpunit/tests/media.php

@@ -1654 +1654 @@
                 $expected = trim( $expected, ' ,' );
 
-                foreach ( $intermediates as $int ) {
-                        $image_url  = wp_get_attachment_image_url( self::$large_id, $int );
-                        $size_array = $this->get_image_size_array_from_meta( $image_meta, $int );
-
-                        if ( 'full' === $int ) {
+                foreach ( $intermediates as $int_size ) {
+                        $image_url  = wp_get_attachment_image_url( self::$large_id, $int_size );
+                        $size_array = $this->get_image_size_array_from_meta( $image_meta, $int_size );
+
+                        if ( 'full' === $int_size ) {
                                 // Add the full size image. Expected to be in the srcset when the full size image is used as src.
                                 $_expected = $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w, ' . $expected;
@@ -1707 +1707 @@
                 $expected = trim( $expected, ' ,' );
 
-                foreach ( $intermediates as $int ) {
-                        $size_array = $this->get_image_size_array_from_meta( $image_meta, $int );
-                        $image_url  = wp_get_attachment_image_url( $id, $int );
-
-                        if ( 'full' === $int ) {
+                foreach ( $intermediates as $int_size ) {
+                        $image_urls[ $int_size ] = wp_get_attachment_image_url( $id, $int_size );
+                }
+
+                // Remove the attachment.
+                wp_delete_attachment( $id, true );
+                remove_filter( 'upload_dir', '_upload_dir_no_subdir' );
+
+                foreach ( $intermediates as $int_size ) {
+                        $size_array = $this->get_image_size_array_from_meta( $image_meta, $int_size );
+                        $image_url  = $image_urls[ $int_size ];
+
+                        if ( 'full' === $int_size ) {
                                 // Add the full size image. Expected to be in the srcset when the full size image is used as src.
                                 $_expected = $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w, ' . $expected;
@@ -1722 +1730 @@
                 }
 
-                // Remove the attachment.
-                wp_delete_attachment( $id, true );
-                remove_filter( 'upload_dir', '_upload_dir_no_subdir' );
         }
 
@@ -1797 +1802 @@
                 $image_meta['file'] = 'H:\home\wordpress\trunk/wp-content/uploads/' . $image_meta['file'];
 
-                foreach ( $intermediates as $int ) {
-                        $image_url  = wp_get_attachment_image_url( self::$large_id, $int );
-                        $size_array = $this->get_image_size_array_from_meta( $image_meta, $int );
-
-                        if ( 'full' === $int ) {
+                foreach ( $intermediates as $int_size ) {
+                        $image_url  = wp_get_attachment_image_url( self::$large_id, $int_size );
+                        $size_array = $this->get_image_size_array_from_meta( $image_meta, $int_size );
+
+                        if ( 'full' === $int_size ) {
                                 // Add the full size image. Expected to be in the srcset when the full size image is used as src.
                                 $_expected = $uploads_dir_url . $full_size_file . ' ' . $image_meta['width'] . 'w, ' . $expected;