From 6db50cd8b2f0f37d09fc7bd141e9c9d9f566e941 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 9 Dec 2016 23:35:55 +0000
Subject: [PATCH] Build/Test Tools: Reuse another fixture in the user
 capability tests.

See #38716


git-svn-id: https://develop.svn.wordpress.org/trunk@39555 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/user/capabilities.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/tests/user/capabilities.php b/tests/phpunit/tests/user/capabilities.php
index a8ba2acd8f..da1c313b88 100644
--- a/tests/phpunit/tests/user/capabilities.php
+++ b/tests/phpunit/tests/user/capabilities.php
@@ -1386,16 +1386,20 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
 	 * @ticket 28374
 	 */
 	function test_current_user_edit_caps() {
-		$user = new WP_User( self::factory()->user->create( array( 'role' => 'contributor' ) ) );
+		$user = self::$users['contributor'];
 		wp_set_current_user( $user->ID );
 
 		$user->add_cap( 'publish_posts' );
-		$user->add_cap( 'publish_pages' );
 		$this->assertTrue( $user->has_cap( 'publish_posts' ) );
+
+		$user->add_cap( 'publish_pages' );
 		$this->assertTrue( $user->has_cap( 'publish_pages' ) );
 
 		$user->remove_cap( 'publish_pages' );
 		$this->assertFalse( $user->has_cap( 'publish_pages' ) );
+
+		$user->remove_cap( 'publish_posts' );
+		$this->assertFalse( $user->has_cap( 'publish_posts' ) );
 	}
 
 	function test_subscriber_cant_edit_posts() {