Use self::delete_user() instead of individual delete user conditional…

…s in PHPUnit tests.
felixarntz · Aug 9, 2024 · 1700958 · 1700958
1 parent 4d8052b
commit 1700958
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 30 deletions.
diff --git a/tests/phpunit/tests/Admin_Pages/Admin_Menu_Tests.php b/tests/phpunit/tests/Admin_Pages/Admin_Menu_Tests.php
@@ -30,11 +30,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	}
 
 	public static function wpTearDownAfterClass() {
-		if ( is_multisite() ) {
-			wpmu_delete_user( self::$admin_id );
-		} else {
-			wp_delete_user( self::$admin_id );
-		}
+		self::delete_user( self::$admin_id );
 	}
 
 	public function set_up() {

diff --git a/tests/phpunit/tests/Capabilities/Capability_Filters_Tests.php b/tests/phpunit/tests/Capabilities/Capability_Filters_Tests.php
@@ -30,11 +30,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	}
 
 	public static function wpTearDownAfterClass() {
-		if ( is_multisite() ) {
-			wpmu_delete_user( self::$admin_id );
-		} else {
-			wp_delete_user( self::$admin_id );
-		}
+		self::delete_user( self::$admin_id );
 	}
 
 	public function set_up() {

diff --git a/tests/phpunit/tests/Entities/User_Query_Tests.php b/tests/phpunit/tests/Entities/User_Query_Tests.php
@@ -30,11 +30,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 
 	public static function wpTearDownAfterClass() {
 		foreach ( self::$users as $user_id ) {
-			if ( is_multisite() ) {
-				wpmu_delete_user( $user_id );
-			} else {
-				wp_delete_user( $user_id );
-			}
+			self::delete_user( $user_id );
 		}
 	}
 

diff --git a/tests/phpunit/tests/Entities/User_Repository_Tests.php b/tests/phpunit/tests/Entities/User_Repository_Tests.php
@@ -29,11 +29,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	}
 
 	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 );
 	}
 
 	public function set_up() {

diff --git a/tests/phpunit/tests/Entities/User_Tests.php b/tests/phpunit/tests/Entities/User_Tests.php
@@ -32,11 +32,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	}
 
 	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 );
 	}
 
 	public function set_up() {

diff --git a/tests/phpunit/tests/General/Current_User_Tests.php b/tests/phpunit/tests/General/Current_User_Tests.php
@@ -32,11 +32,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 
 	public static function wpTearDownAfterClass() {
 		foreach ( self::$user_ids as $user_id ) {
-			if ( is_multisite() ) {
-				wpmu_delete_user( $user_id );
-			} else {
-				wp_delete_user( $user_id );
-			}
+			self::delete_user( $user_id );
 		}
 	}