Changeset 8514 for trunk/tests/phpunit/testcases/friends/functions.php

Timestamp:

06/14/2014 06:49:55 PM (10 years ago)

Author:

r-a-y

Message:

Check BP_User_Query when using friends_check_friendship_status().

Previously, friends_check_friendship_status() did not reference the data
already queried in the members loop via BP_User_Query. As a result, if
a user was logged in and viewing the member directory, this added twenty
additional DB queries to the page.

This commit:

• Adds an additional property - friendship_status - to bp_friends_filter_user_query_populate_extras(). This property references the various friendship statuses from BP_Friends_Friendship::check_is_friend()
• Checks this new property in friends_check_friendship_status() before querying the DB
• Adds unit tests

Props r-a-y, boonebgorges.

Fixes #5703.

File:

• trunk/tests/phpunit/testcases/friends/functions.php (modified) (1 diff)

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

@@ -136 +136 @@
         $this->assertTrue( friends_add_friend( $u1, $u2 ) );
     }
+
+    /**
+     * @group friends_check_friendship_status
+     */
+    public function test_friends_check_friendship_status_in_members_loop() {
+        $now = time();
+        $u1 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now ),
+        ) );
+        $u2 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
+        ) );
+        $u3 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now - 200 ),
+        ) );
+        $u4 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now - 300 ),
+        ) );
+        $u5 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now - 400 ),
+        ) );
+
+        friends_add_friend( $u1, $u2, true );
+        friends_add_friend( $u1, $u3, false );
+        friends_add_friend( $u4, $u1, false );
+
+        $old_user = get_current_user_id();
+        $this->set_current_user( $u1 );
+
+        $found = array();
+        if ( bp_has_members() ) : while ( bp_members() ) : bp_the_member();
+            $found[ bp_get_member_user_id() ] = friends_check_friendship_status( $u1, bp_get_member_user_id() );
+        endwhile; endif;
+
+        $expected = array(
+            $u1 => 'not_friends',
+            $u2 => 'is_friend',
+            $u3 => 'pending',
+            $u4 => 'awaiting_response',
+            $u5 => 'not_friends',
+        );
+
+        $this->assertSame( $expected, $found );
+
+        // clean up
+        $GLOBALS['members_template'] = null;
+        $this->set_current_user( $old_user );
+    }
+
+    /**
+     * @group friends_check_friendship_status
+     */
+    public function test_friends_check_friendship_status_not_in_members_loop() {
+        $now = time();
+        $u1 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now ),
+        ) );
+        $u2 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
+        ) );
+        $u3 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now - 200 ),
+        ) );
+        $u4 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now - 300 ),
+        ) );
+        $u5 = $this->create_user( array(
+            'last_activity' => date( 'Y-m-d H:i:s', $now - 400 ),
+        ) );
+
+        friends_add_friend( $u1, $u2, true );
+        friends_add_friend( $u1, $u3, false );
+        friends_add_friend( $u4, $u1, false );
+
+        $found = array(
+            $u1 => friends_check_friendship_status( $u1, $u1 ),
+            $u2 => friends_check_friendship_status( $u1, $u2 ),
+            $u3 => friends_check_friendship_status( $u1, $u3 ),
+            $u4 => friends_check_friendship_status( $u1, $u4 ),
+            $u5 => friends_check_friendship_status( $u1, $u5 ),
+        );
+
+        $expected = array(
+            $u1 => 'not_friends',
+            $u2 => 'is_friend',
+            $u3 => 'pending',
+            $u4 => 'awaiting_response',
+            $u5 => 'not_friends',
+        );
+
+        $this->assertSame( $expected, $found );
+    }
 }