Ticket #7882: 7882.fix-unittest.patch

tests/phpunit/testcases/core/class-bp-core-user.php

@@ -9 +9 @@
          * @expectedDeprecated BP_Core_User::get_users
          */
         public function test_get_users_with_exclude_querystring() {
+                add_filter( 'bp_use_legacy_user_query', '__return_true' );
+
                 $u1 = self::factory()->user->create();
                 $u2 = self::factory()->user->create();
                 $u3 = self::factory()->user->create();
@@ -18 +20 @@
                 $users = BP_Core_User::get_users( 'active', 0, 1, 0, false, false, true, $exclude_qs );
                 $user_ids = wp_parse_id_list( wp_list_pluck( $users['users'], 'id' ) );
 
+                remove_filter( 'bp_use_legacy_user_query', '__return_true' );
+
                 $this->assertEquals( array( $u2 ), $user_ids );
         }
 
@@ -25 +29 @@
          * @expectedDeprecated BP_Core_User::get_users
          */
         public function test_get_users_with_exclude_array() {
+                add_filter( 'bp_use_legacy_user_query', '__return_true' );
+
                 $u1 = self::factory()->user->create();
                 $u2 = self::factory()->user->create();
                 $u3 = self::factory()->user->create();
@@ -38 +44 @@
                 $users = BP_Core_User::get_users( 'active', 0, 1, 0, false, false, true, $exclude_array );
                 $user_ids = wp_parse_id_list( wp_list_pluck( $users['users'], 'id' ) );
 
+                remove_filter( 'bp_use_legacy_user_query', '__return_true' );
+
                 $this->assertEquals( array( $u2 ), $user_ids );
         }
 
@@ -45 +53 @@
          * @expectedDeprecated BP_Core_User::get_users
          */
         public function test_get_users_with_include_querystring() {
+                add_filter( 'bp_use_legacy_user_query', '__return_true' );
+
                 $u1 = self::factory()->user->create( array(
                         'last_activity' => gmdate( 'Y-m-d H:i:s' ),
                 ) );
@@ -60 +70 @@
                 $users = BP_Core_User::get_users( 'active', 0, 1, 0, $include_qs );
                 $user_ids = wp_parse_id_list( wp_list_pluck( $users['users'], 'id' ) );
 
+                remove_filter( 'bp_use_legacy_user_query', '__return_true' );
+
                 $this->assertEquals( array( $u1, $u3 ), $user_ids );
         }
 
@@ -67 +79 @@
          * @expectedDeprecated BP_Core_User::get_users
          */
         public function test_get_users_with_include_array() {
+                add_filter( 'bp_use_legacy_user_query', '__return_true' );
+
                 $u1 = self::factory()->user->create( array(
                         'last_activity' => gmdate( 'Y-m-d H:i:s' ),
                 ) );
@@ -90 +104 @@
                 // typecast...ugh
                 $user_ids = array_map( 'intval', $user_ids );
 
+                remove_filter( 'bp_use_legacy_user_query', '__return_true' );
+
                 $this->assertEquals( array( $u1, $u3 ), $user_ids );
         }
 

tests/phpunit/testcases/members/functions.php

@@ -386 +386 @@
 
                 // Setup parameters to assert to be the same
                 $expected = $time;
-                $found    = bp_get_user_meta( $user, 'last_activity', true );
+                $found    = bp_get_user_last_activity( $user );
 
                 $this->assertSame( $expected, $found );
         }