Changeset 38731

Timestamp:

10/05/2016 04:56:32 PM (8 years ago)

Author:

johnbillion

Message:

Role/Capability: Reuse some user account fixtures in the user capability tests.

See #38235

File:

• trunk/tests/phpunit/tests/user/capabilities.php (modified) (8 diffs)

trunk/tests/phpunit/tests/user/capabilities.php

@@ -975 +975 @@
      */
     function test_create_posts_caps() {
-        $author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
-        $admin = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
-        $author_2 = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
-        $editor = new WP_User( self::factory()->user->create( array( 'role' => 'editor' ) ) );
-        $contributor = new WP_User( self::factory()->user->create( array( 'role' => 'contributor' ) ) );
+        $admin       = self::$users['administrator'];
+        $author      = self::$users['author'];
+        $editor      = self::$users['editor'];
+        $contributor = self::$users['contributor'];
 
         // create_posts isn't a real cap.
@@ -985 +984 @@
         $this->assertFalse($author->has_cap('create_posts'));
         $this->assertFalse($editor->has_cap('create_posts'));
-        $this->assertFalse($author_2->has_cap('create_posts'));
         $this->assertFalse($contributor->has_cap('create_posts'));
 
@@ -992 +990 @@
 
         $this->assertEquals( 'edit_posts', $cap->create_posts );
-
-        $this->assertTrue($admin->has_cap( $cap->create_posts ));
 
         $this->assertTrue($admin->has_cap( $cap->create_posts ));
         $this->assertTrue($author->has_cap( $cap->create_posts ));
         $this->assertTrue($editor->has_cap( $cap->create_posts ));
-        $this->assertTrue($author_2->has_cap( $cap->create_posts ));
         $this->assertTrue($contributor->has_cap( $cap->create_posts ));
 
@@ -1012 +1007 @@
         $this->assertFalse($author->has_cap( $cap->create_posts ));
         $this->assertFalse($editor->has_cap( $cap->create_posts ));
-        $this->assertFalse($author_2->has_cap( $cap->create_posts ));
         $this->assertFalse($contributor->has_cap( $cap->create_posts ));
 
@@ -1021 +1015 @@
         $this->assertFalse($author->has_cap( $cap->create_posts ));
         $this->assertFalse($editor->has_cap( $cap->create_posts ));
-        $this->assertFalse($author_2->has_cap( $cap->create_posts ));
         $this->assertFalse($contributor->has_cap( $cap->create_posts ));
+
+        $admin->remove_cap( 'edit_foobars' );
 
         _unregister_post_type( 'foobar' );
@@ -1201 +1196 @@
      */
     function test_negative_caps() {
-        $author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
+        $author = self::$users['author'];
         $author->add_cap( 'foo', false );
         $this->assertTrue ( isset( $author->caps['foo'] ) );
@@ -1212 +1207 @@
      */
     function test_set_role_same_role() {
-        $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+        $user = self::$users['administrator'];
         $caps = $user->caps;
         $this->assertNotEmpty( $user->caps );
@@ -1223 +1218 @@
         global $wpdb;
 
-        $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+        $user = self::$users['administrator'];
         $old_uid = get_current_user_id();
         wp_set_current_user( $user->ID );