Changeset 38732

Timestamp:

10/05/2016 05:17:02 PM (8 years ago)

Author:

johnbillion

Message:

Role/capability: Add more complete capability and role assertions to existing user capability tests. Also reuses one more user account fixtures.

Fixes #38236
See #38235

File:

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

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

@@ -684 +684 @@
 
         // shouldn't have any other caps
-        $this->assertFalse($user->has_cap('upload_files'));
-        $this->assertFalse($user->has_cap('edit_published_posts'));
-        $this->assertFalse($user->has_cap('upload_files'));
-        $this->assertFalse($user->has_cap('level_4'));
+        $caps = $this->getAllCapsAndRoles();
+        foreach ( $caps as $cap => $roles ) {
+            if ( 'level_1' !== $cap ) {
+                $this->assertFalse( $user->has_cap( $cap ), "User should not have the {$cap} capability" );
+            }
+        }
 
         // clean up
@@ -758 +760 @@
 
         // make sure the other caps didn't get messed up
-        $this->assertTrue($user_1->has_cap('edit_posts'));
-        $this->assertTrue($user_1->has_cap('read'));
-        $this->assertTrue($user_1->has_cap('level_1'));
-        $this->assertTrue($user_1->has_cap('level_0'));
-        $this->assertFalse($user_1->has_cap('upload_files'));
-        $this->assertFalse($user_1->has_cap('edit_published_posts'));
-        $this->assertFalse($user_1->has_cap('level_2'));
+        $caps = $this->getAllCapsAndRoles();
+        foreach ( $caps as $cap => $roles ) {
+            if ( in_array( 'contributor', $roles, true ) || 'publish_posts' === $cap ) {
+                $this->assertTrue( $user_1->has_cap( $cap ), "User should have the {$cap} capability" );
+            } else {
+                $this->assertFalse( $user_1->has_cap( $cap ), "User should not have the {$cap} capability" );
+            }
+        }
 
     }
@@ -848 +851 @@
         $this->assertTrue($user->exists(), "Problem getting user $id");
 
-        // capabilities for the author role should be gone
-#       $this->assertFalse($user->has_cap('edit_posts'));
-#       $this->assertFalse($user->has_cap('edit_published_posts'));
-#       $this->assertFalse($user->has_cap('upload_files'));
-#       $this->assertFalse($user->has_cap('level_2'));
+        // all capabilities for the user should be gone
+        foreach ( $this->getAllCapsAndRoles() as $cap => $roles ) {
+            $this->assertFalse( $user->has_cap( $cap ), "User should not have the {$cap} capability" );
+        }
 
         // the extra capabilities should be gone
@@ -960 +962 @@
         $contributor = self::$users['contributor'];
 
-        // editor can edit, view, and trash
+        // editor can publish, edit, view, and trash
+        $this->assertTrue( $editor->has_cap( 'publish_post', $post ) );
         $this->assertTrue( $editor->has_cap( 'edit_post', $post ) );
         $this->assertTrue( $editor->has_cap( 'delete_post', $post ) );
@@ -966 +969 @@
 
         // a contributor cannot (except read a published post)
+        $this->assertFalse( $contributor->has_cap( 'publish_post', $post ) );
         $this->assertFalse( $contributor->has_cap( 'edit_post', $post ) );
         $this->assertFalse( $contributor->has_cap( 'delete_post', $post ) );
@@ -979 +983 @@
         $editor      = self::$users['editor'];
         $contributor = self::$users['contributor'];
+        $subscriber  = self::$users['subscriber'];
 
         // create_posts isn't a real cap.
@@ -985 +990 @@
         $this->assertFalse($editor->has_cap('create_posts'));
         $this->assertFalse($contributor->has_cap('create_posts'));
+        $this->assertFalse($subscriber->has_cap('create_posts'));
 
         register_post_type( 'foobar' );
@@ -995 +1001 @@
         $this->assertTrue($editor->has_cap( $cap->create_posts ));
         $this->assertTrue($contributor->has_cap( $cap->create_posts ));
+        $this->assertFalse($subscriber->has_cap( $cap->create_posts ));
 
         _unregister_post_type( 'foobar' );
@@ -1008 +1015 @@
         $this->assertFalse($editor->has_cap( $cap->create_posts ));
         $this->assertFalse($contributor->has_cap( $cap->create_posts ));
+        $this->assertFalse($subscriber->has_cap( $cap->create_posts ));
 
         // Add edit_foobars primitive cap to a user.
@@ -1016 +1024 @@
         $this->assertFalse($editor->has_cap( $cap->create_posts ));
         $this->assertFalse($contributor->has_cap( $cap->create_posts ));
+        $this->assertFalse($subscriber->has_cap( $cap->create_posts ));
 
         $admin->remove_cap( 'edit_foobars' );
@@ -1029 +1038 @@
         $this->assertTrue( $contributor->has_cap( $cap->edit_posts ) );
         $this->assertFalse( $contributor->has_cap( $cap->create_posts ) );
+        $this->assertFalse( $subscriber->has_cap( $cap->create_posts ) );
     }
 
@@ -1197 +1207 @@
     function test_negative_caps() {
         $author = self::$users['author'];
+
         $author->add_cap( 'foo', false );
         $this->assertTrue ( isset( $author->caps['foo'] ) );
+        $this->assertFalse( user_can( $author->ID, 'foo' ) );
+
         $author->remove_cap( 'foo' );
         $this->assertFalse ( isset( $author->caps['foo'] ) );
+        $this->assertFalse( user_can( $author->ID, 'foo' ) );
     }
 
@@ -1364 +1378 @@
         $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
         $user->add_cap( 'manage_network_users' );
-        $other_user = new WP_User( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
+        $other_user = self::$users['subscriber'];
 
         wp_set_current_user( $user->ID );
@@ -1466 +1480 @@
         }
 
+        $this->assertFalse( current_user_can( 'do_not_allow' ), "Non-logged-in user should not have the do_not_allow capability" );
     }