Ticket #29785: phpunit_test_countUsers.patch

countUsers.php

@@ -32 +32 @@
                 $subscriber = self::factory()->user->create( array(
                         'role' => 'subscriber',
                 ) );
+                $spam = self::factory()->user->create( array(
+                        'role' => 'spam',
+                ) );
                 $none = self::factory()->user->create( array(
                         'role' => '',
                 ) );
@@ -49 +52 @@
                         'author'        => 1,
                         'contributor'   => 1,
                         'subscriber'    => 1,
+                        'spam'                  => 1,
                         'none'          => 2,
                 ), $count['avail_roles'] );
 
@@ -82 +86 @@
                 $subscriber = self::factory()->user->create( array(
                         'role' => 'subscriber',
                 ) );
+                $spam = self::factory()->user->create( array(
+                        'role' => 'spam',
+                ) );
                 $none = self::factory()->user->create( array(
                         'role' => '',
                 ) );

multisite.php

@@ -199 +199 @@
         function test_is_user_spammy() {
                 $user_id = self::factory()->user->create( array(
                         'role' => 'author',
-                        'user_login' => 'testuser1',
+                        'user_login' => 'spam',
                 ) );
 
                 $spam_username = (string) $user_id;