Changeset 54417 for trunk/tests/phpunit/tests/image/editor.php

Timestamp:

10/07/2022 07:15:59 PM (2 years ago)

Author:

adamsilverstein

Message:

Media: ensure the wp_editor_set_quality filter consistently passes the correct output mime type.

Ensure that the mime type passed to the wp_editor_set_quality filter is correct when the output format is altered with the image_editor_output_format filter and the image is saved multiple times, for example when generating sub sizes. Previously, the original image mime type was passed instead of the output type after the initial save.

Props flixos90, peterwilsoncc.
Fixes #56442.

File:

• trunk/tests/phpunit/tests/image/editor.php (modified) (5 diffs)

trunk/tests/phpunit/tests/image/editor.php

@@ -106 +106 @@
         // Ensure wp_editor_set_quality filter applies if it exists before editor instantiation.
         $this->assertSame( 100, $editor->get_quality() );
-
-        // Clean up.
-        remove_filter( 'wp_editor_set_quality', $func_100_percent );
     }
 
@@ -120 +117 @@
         $editor->set_mime_type( 'image/png' ); // Ensure mime-specific filters act properly.
 
+        // Quality setting for the source image. For PNG the fallback default of 82 is used.
+        $this->assertSame( 82, $editor->get_quality(), 'Default quality setting is 82.' );
+
         // Set conversions for uploaded images.
         add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_formats' ) );
@@ -126 +126 @@
         $this->assertSame( 82, $editor->get_quality(), 'Default quality setting is 82.' );
 
-        // Quality should change to the output format's value.
-        // A PNG image will be converted to WEBP whose quialty should be 86.
-        $editor->save();
-        $this->assertSame( 86, $editor->get_quality(), 'Output image format is WEBP. Quality setting for it should be 86.' );
-
-        // Removing PNG to WEBP conversion on save. Quality setting should reset to the default.
+        // When saving, quality should change to the output format's value.
+        // A PNG image will be converted to WebP whose quality should be 86.
+        $editor->save();
+        $this->assertSame( 86, $editor->get_quality(), 'Output image format is WebP. Quality setting for it should be 86.' );
+
+        // Saving again should not change the quality.
+        $editor->save();
+        $this->assertSame( 86, $editor->get_quality(), 'Output image format is WebP. Quality setting for it should be 86.' );
+
+        // Removing PNG to WebP conversion on save. Quality setting should reset to the default.
         remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_formats' ) );
         $editor->save();
@@ -150 +154 @@
 
         // Quality should change to the output format's value as filtered above.
-        // A JPEG image will be converted to WEBP whose quialty should be 42.
-        $editor->save();
-        $this->assertSame( 42, $editor->get_quality(), 'Image conversion from JPEG to WEBP. Filtered WEBP quality shoild be 42.' );
+        // A JPEG image will be converted to WebP whose quialty should be 42.
+        $editor->save();
+        $this->assertSame( 42, $editor->get_quality(), 'Image conversion from JPEG to WEBP. Filtered WEBP quality should be 42.' );
 
         // After removing the conversion the quality setting should reset to the filtered value for the original image type, JPEG.
@@ -162 +166 @@
             'After removing image conversion the quality setting should reset to the filtered value for JPEG, 56.'
         );
-
-        remove_filter( 'wp_editor_set_quality', array( $this, 'image_editor_change_quality' ) );
     }