Changeset 41138 for trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php

Timestamp:

07/25/2017 12:23:44 AM (8 years ago)

Author:

johnbillion

Message:

Users: Ensure that users with no role on a site are taken into consideration when listing users on Multisite.

This ensures that users who are a member of a site but have no role are correctly listed on the Users screen and can be filtered from the 'None' role filter.

Props tobi823, flixos90, scottlee

Fixes #36196

File:

• trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php (modified) (2 diffs)

trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php

@@ -37 +37 @@
     /**
      * @ticket 22993
+     * @ticket 36196
      * @group multisite
      * @group ms-required
@@ -57 +58 @@
         ) );
 
-        // Add users to blogs
+        // Add editor to blog 1
         add_user_to_blog( $blog_1, $editor, 'editor' );
 
         // Test users on root site
         $users = wp_get_users_with_no_role();
+        $this->assertSame( array(
+            "{$nobody}",
+        ), $users );
+
+        // Test users counts on blog 1
+        $users = wp_get_users_with_no_role( $blog_1 );
         $this->assertSame( array(), $users );
 
-        // Test users counts on blog 1
-        switch_to_blog( $blog_1 );
-        $users = wp_get_users_with_no_role();
-        restore_current_blog();
+        // Add admin to blog 1 with no role
+        add_user_to_blog( $blog_1, $admin, '' );
 
-        // Test users on root site
-        $this->assertSame( array(), $users );
-
+        // Re-test users counts on blog 1
+        $users = wp_get_users_with_no_role( $blog_1 );
+        $this->assertSame( array(
+            "{$admin}",
+        ), $users );
     }