From 5de9799317b451f9295dfbe089cfdab3ae78d659 Mon Sep 17 00:00:00 2001 From: johnbillion Date: Sun, 30 Oct 2016 00:32:03 +0000 Subject: [PATCH] Role/Capability: Reuse a fixture in a couple more unit tests. See #30017 git-svn-id: https://develop.svn.wordpress.org/trunk@39008 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/user/capabilities.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/phpunit/tests/user/capabilities.php b/tests/phpunit/tests/user/capabilities.php index 42868f76ea..bbb8c17a34 100644 --- a/tests/phpunit/tests/user/capabilities.php +++ b/tests/phpunit/tests/user/capabilities.php @@ -1382,13 +1382,17 @@ class Tests_User_Capabilities extends WP_UnitTestCase { return; } - $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) ); + $user = self::$users['administrator']; $user->add_cap( 'manage_network_users' ); $other_user = self::$users['subscriber']; wp_set_current_user( $user->ID ); - $this->assertTrue( current_user_can( 'edit_user', $other_user->ID ) ); + $can_edit_user = current_user_can( 'edit_user', $other_user->ID ); + + $user->remove_cap( 'manage_network_users' ); + + $this->assertTrue( $can_edit_user ); } function test_multisite_administrator_with_manage_network_users_can_not_edit_super_admin() { @@ -1397,14 +1401,19 @@ class Tests_User_Capabilities extends WP_UnitTestCase { return; } - $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) ); + $user = self::$users['administrator']; $user->add_cap( 'manage_network_users' ); - $super_admin = new WP_User( self::factory()->user->create( array( 'role' => 'subscriber' ) ) ); + $super_admin = self::$users['subscriber']; grant_super_admin( $super_admin->ID ); wp_set_current_user( $user->ID ); - $this->assertFalse( current_user_can( 'edit_user', $super_admin->ID ) ); + $can_edit_user = current_user_can( 'edit_user', $super_admin->ID ); + + $user->remove_cap( 'manage_network_users' ); + revoke_super_admin( $super_admin->ID ); + + $this->assertFalse( $can_edit_user ); } /**