Ticket #38433: 38433.diff

tests/phpunit/tests/user/capabilities.php

@@ -1572 +1572 @@
                 $user->remove_cap( 'publish_posts' );
                 $this->assertFalse( $user->has_cap( 'publish_posts' ) );
         }
-
+        /**
+         * @group santilin
+         */
         function test_subscriber_cant_edit_posts() {
                 $user = self::$users['subscriber'];
                 wp_set_current_user( $user->ID );
@@ -1580 +1582 @@
                 $post = self::factory()->post->create( array( 'post_author' => 1 ) );
 
                 $this->assertFalse( current_user_can( 'edit_post', $post ) );
+                $this->assertFalse( current_user_can_for_blog( get_current_blog_id(), 'edit_post', $post ) );
+                $this->assertFalse( current_user_can( 'edit_post', $post + 1 ) );
+                $this->assertFalse( current_user_can_for_blog( get_current_blog_id(), 'edit_post', $post + 1 ) );
+        }
+
+        /**
+         * @group santilin
+         */
+        function test_editor_can_edit_posts() {
+                $user = self::$users['editor'];
+                wp_set_current_user( $user->ID );
+
+                $post = self::factory()->post->create( array( 'post_author' => $user->ID ) );
+
+                $this->assertTrue( current_user_can( 'edit_post', $post ) );
                 $this->assertFalse( current_user_can( 'edit_post', $post + 1 ) );
+                $this->assertTrue( current_user_can_for_blog( get_current_blog_id(), 'edit_post', $post ) );
+                $this->assertFalse( current_user_can_for_blog( get_current_blog_id(), 'edit_post', $post + 1 ) );
+                // The following assert fails when it shouldnt
+                $this->assertFalse( current_user_can_for_blog( 12345, 'edit_post', $post ) );
+                $this->assertFalse( current_user_can_for_blog( 12345, 'edit_post', $post + 1 ) );
         }
 
         /**