Changeset 13981

Timestamp:

07/27/2024 04:54:18 PM (11 months ago)

Author:

espellcaste

Message:

Unit tests: Add test that confirms the multisite query for bp_core_get_active_member_count() excludes the spam status.

Props imath, johnjamesjacoby.

Closes ​https://github.com/buddypress/buddypress/pull/328
Fixes #6155

Location:

trunk

Files:

• src/bp-core/bp-core-cache.php (modified) (1 diff)
• src/bp-core/bp-core-template.php (modified) (2 diffs)
• src/bp-members/bp-members-functions.php (modified) (1 diff)
• tests/phpunit/testcases/members/functions.php (modified) (1 diff)

trunk/src/bp-core/bp-core-cache.php

@@ -54 +54 @@
 
 /**
- * Clear member count caches and transients.
+ * Clear member count caches and/or transients.
  *
  * @since 1.6.0

trunk/src/bp-core/bp-core-template.php

@@ -982 +982 @@
 }
     /**
-     * Return the total member count in your BP instance.
+     * Return the total member count for the site.
      *
      * Since BuddyPress 1.6, this function has used bp_core_get_active_member_count(),
@@ -1000 +1000 @@
 
         /**
-         * Filters the total member count in your BP instance.
+         * Filters the total member count for the site.
          *
          * @since 1.2.0
          *
-         * @param int $value Member count.
+         * @param int $member_count Member count.
          */
         return apply_filters( 'bp_get_total_member_count', bp_core_get_active_member_count() );

trunk/src/bp-members/bp-members-functions.php

@@ -615 +615 @@
 
     $count = get_transient( 'bp_active_member_count' );
+
     if ( false === $count ) {
         $bp = buddypress();

trunk/tests/phpunit/testcases/members/functions.php

@@ -764 +764 @@
         $this->assertNotEmpty( $user->roles );
     }
+
+    /**
+     * @ticket BP6155
+     */
+    public function test_bp_core_get_active_member_count_excludes_spammed_users() {
+        $this->assertSame( 0, bp_core_get_active_member_count() );
+        $this->assertSame( 0, bp_get_total_member_count() );
+
+        $u1 = self::factory()->user->create();
+        $u2 = self::factory()->user->create();
+
+        // The two users were created, but they are not "active" yet.
+        $this->assertSame( 0, bp_core_get_active_member_count() );
+        $this->assertSame( 0, bp_get_total_member_count() );
+
+        // Fake their first activity to make them "active".
+        do_action( 'bp_first_activity_for_member', $u1 );
+        do_action( 'bp_first_activity_for_member', $u2 );
+
+        $this->assertSame( 2, bp_core_get_active_member_count() );
+        $this->assertSame( 2, bp_get_total_member_count() );
+
+        // Spam user 2.
+        if ( is_multisite() ) {
+            wp_update_user( array( 'ID' => $u2, 'spam' => '1' ) );
+        } else {
+            bp_core_process_spammer_status( $u2, 'spam' );
+        }
+
+        // Check if user 2 is a spammer.
+        $this->assertTrue( bp_is_user_spammer( $u2 ) );
+
+        // Recount the active member count.
+        $this->assertSame( 1, bp_core_get_active_member_count() );
+        $this->assertSame( 1, bp_get_total_member_count() );
+
+        // Delete user 1.
+        if ( is_multisite() ) {
+            wpmu_delete_user( $u1 );
+        } else {
+            wp_delete_user( $u1 );
+        }
+
+        $this->assertSame( 0, bp_core_get_active_member_count() );
+        $this->assertSame( 0, bp_get_total_member_count() );
+    }
 }