Changeset 53464

Timestamp:

06/04/2022 01:39:17 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Consistently pass the $force_delete parameter to wp_delete_attachment().

Convert some wp_delete_post() calls to wp_delete_attachment() to avoid an extra function call.

See #55652.

Location:

trunk/tests/phpunit/tests

Files:

• media.php (modified) (6 diffs)
• post/thumbnails.php (modified) (1 diff)
• rest-api/rest-schema-setup.php (modified) (1 diff)

trunk/tests/phpunit/tests/media.php

@@ -53 +53 @@
 
     public static function tear_down_after_class() {
-        wp_delete_post( self::$large_id, true );
+        wp_delete_attachment( self::$large_id, true );
         parent::tear_down_after_class();
     }
@@ -1307 +1307 @@
 
         // Clean up.
-        wp_delete_attachment( $post_id );
+        wp_delete_attachment( $post_id, true );
 
         $this->assertSame( 'This is a comment. / Это комментарий. / Βλέπετε ένα σχόλιο.', $post->post_excerpt );
@@ -1346 +1346 @@
 
         // Clean up.
-        wp_delete_attachment( $post_id );
+        wp_delete_attachment( $post_id, true );
 
         $this->assertSame( 'This is a test', $post->post_title );
@@ -1725 +1725 @@
 
         // Remove the attachment.
-        wp_delete_attachment( $id );
+        wp_delete_attachment( $id, true );
         remove_filter( 'upload_dir', '_upload_dir_no_subdir' );
     }
@@ -2820 +2820 @@
 
         // Clean up.
-        wp_delete_attachment( $post_id );
-        wp_delete_post( $parent_id );
+        wp_delete_attachment( $post_id, true );
+        wp_delete_post( $parent_id, true );
 
         $this->assertSame( $expected, $url );
@@ -2872 +2872 @@
 
         // Clean up.
-        wp_delete_attachment( $post_id );
-        wp_delete_post( $parent_id );
+        wp_delete_attachment( $post_id, true );
+        wp_delete_post( $parent_id, true );
 
         $this->assertSame( $expected, $url );

trunk/tests/phpunit/tests/post/thumbnails.php

@@ -28 +28 @@
 
     public static function tear_down_after_class() {
-        wp_delete_post( self::$attachment_id, true );
+        wp_delete_attachment( self::$attachment_id, true );
         parent::tear_down_after_class();
     }

trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php

@@ -521 +521 @@
         wp_delete_post( $page_id, true );
         wp_delete_term( $tag_id, 'tags' );
-        wp_delete_attachment( $media_id );
+        wp_delete_attachment( $media_id, true );
         wp_delete_comment( $comment_id );
     }