Changeset 58876

Timestamp:

08/09/2024 06:29:47 PM (2 years ago)

Author:

flixos90

Message:

Build/Test Tools: Avoid using wp_delete_user() in PHPUnit tests unless explicitly acknowledging or ignoring Multisite.

wp_delete_user() does not actually delete the entire user when using WordPress Multisite. Therefore tests should typically use the test helper method to fully delete the user, unless explicitly ignoring Multisite or testing the wp_delete_user() function while taking Multisite behavior into account.

Fixes #61851.

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesPlugin.php (modified) (5 diffs)
• link/getDashboardUrl.php (modified) (1 diff)
• rest-api/rest-sidebars-controller.php (modified) (1 diff)
• user/queryCache.php (modified) (1 diff)
• xmlrpc/wp/getUser.php (modified) (1 diff)

trunk/tests/phpunit/tests/admin/includesPlugin.php

@@ -97 +97 @@
 
                 // Clean up the temporary user.
-                wp_delete_user( $admin_user );
+                self::delete_user( $admin_user );
 
                 // Verify the menu was inserted at the expected position.
@@ -205 +205 @@
 
                 // Clean up the temporary user.
-                wp_delete_user( $admin_user );
+                self::delete_user( $admin_user );
 
                 foreach ( $actual_positions as $test => $actual_position ) {
@@ -296 +296 @@
                 // Clean up the temporary user.
                 wp_set_current_user( $current_user );
-                wp_delete_user( $admin_user );
+                self::delete_user( $admin_user );
 
                 // Verify the menu was inserted at the expected position.
@@ -327 +327 @@
                 // Clean up the temporary user.
                 wp_set_current_user( $current_user );
-                wp_delete_user( $admin_user );
+                self::delete_user( $admin_user );
 
                 // Verify the menu was inserted at the expected position.
@@ -356 +356 @@
                 // Clean up the temporary user.
                 wp_set_current_user( $current_user );
-                wp_delete_user( $admin_user );
+                self::delete_user( $admin_user );
 
                 // Verify the menus were inserted.

trunk/tests/phpunit/tests/link/getDashboardUrl.php

@@ -13 +13 @@
 
         public static function wpTearDownAfterClass() {
-                if ( is_multisite() ) {
-                        wpmu_delete_user( self::$user_id );
-                } else {
-                        wp_delete_user( self::$user_id );
-                }
+                self::delete_user( self::$user_id );
         }
 

trunk/tests/phpunit/tests/rest-api/rest-sidebars-controller.php

@@ -44 +44 @@
 
         public static function wpTearDownAfterClass() {
-                wp_delete_user( self::$admin_id );
-                wp_delete_user( self::$author_id );
+                self::delete_user( self::$admin_id );
+                self::delete_user( self::$author_id );
         }
 

trunk/tests/phpunit/tests/user/queryCache.php

@@ -389 +389 @@
                 $this->assertSameSets( $expected, $found, 'Find author in returned values' );
 
-                wp_delete_user( $user_id );
+                self::delete_user( $user_id );
 
                 $q2 = new WP_User_Query(

trunk/tests/phpunit/tests/xmlrpc/wp/getUser.php

@@ -99 +99 @@
                 $this->assertContains( $user_data['role'], $result['roles'] );
 
-                wp_delete_user( $user_id );
+                self::delete_user( $user_id );
         }