Ticket #6099: 6099.patch

src/bp-activity/bp-activity-filters.php

@@ -677 +677 @@
 function bp_activity_filter_favorites_scope( $retval, $filter ) {
         $favs = bp_activity_get_user_favorites( $filter['user_id'] );
         if ( empty( $favs ) ) {
-                return $retval;
+                $favs = array( 0 );
         }
 
         $retval = array(

src/bp-friends/bp-friends-activity.php

@@ -242 +242 @@
         $friends = friends_get_friend_user_ids( $filter['user_id'] );
 
         if ( empty( $friends ) ) {
-                return $retval;
+                $friends = array( 0 );
         }
 
         $retval= array(

src/bp-groups/bp-groups-activity.php

@@ -246 +246 @@
         $groups = groups_get_user_groups( $filter['user_id'] );
 
         if ( empty( $groups['groups'] ) ) {
-                return $retval;
+                $groups = array( 'groups' => 0 );
         }
 
         $retval= array(

tests/phpunit/testcases/activity/template.php

@@ -342 +342 @@
         }
 
         /**
+         * @group scope
+         * @group filter_query
+         * @group BP_Activity_Query
+         */
+        function test_bp_has_activities_scope_friends_no_items() {
+                $u1 = $this->factory->user->create();
+
+                $now = time();
+
+                // Create a random activity
+                $a1 = $this->factory->activity->create( array(
+                        'user_id' => $u1,
+                        'type' => 'activity_update',
+                        'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+                ) );
+
+                global $activities_template;
+                $reset_activities_template = $activities_template;
+
+                // grab activities from friends scope
+                bp_has_activities( array(
+                        'user_id' => $u1,
+                        'scope' => 'friends',
+                ) );
+
+                // assert!
+                $this->assertEmpty( $activities_template->activities, 'When a user does not have any friendship, no activities should be fetched when on friends scope' );
+
+                // clean up!
+                $activities_template = $reset_activities_template;
+        }
+
+        /**
+         * @group scope
+         * @group filter_query
+         * @group BP_Activity_Query
+         */
+        function test_bp_has_activities_scope_favorites_no_items() {
+                $u1 = $this->factory->user->create();
+
+                $now = time();
+
+                // Create a random activity
+                $a1 = $this->factory->activity->create( array(
+                        'user_id' => $u1,
+                        'type' => 'activity_update',
+                        'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+                ) );
+
+                global $activities_template;
+                $reset_activities_template = $activities_template;
+
+                // grab activities from favorites scope
+                bp_has_activities( array(
+                        'user_id' => $u1,
+                        'scope' => 'favorites',
+                ) );
+
+                // assert!
+                $this->assertEmpty( $activities_template->activities, 'When a user has not favorited any activity, no activities should be fetched when on favorites scope' );
+
+                // clean up!
+                $activities_template = $reset_activities_template;
+        }
+
+        /**
+         * @group scope
+         * @group filter_query
+         * @group BP_Activity_Query
+         */
+        function test_bp_has_activities_scope_groups_no_items() {
+                $u1 = $this->factory->user->create();
+
+                $now = time();
+
+                // Create a random activity
+                $a1 = $this->factory->activity->create( array(
+                        'user_id' => $u1,
+                        'type' => 'activity_update',
+                        'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+                ) );
+
+                global $activities_template;
+                $reset_activities_template = $activities_template;
+
+                // grab activities from groups scope
+                bp_has_activities( array(
+                        'user_id' => $u1,
+                        'scope' => 'groups',
+                ) );
+
+                // assert!
+                $this->assertEmpty( $activities_template->activities, 'When a user is not a member of any group, no activities should be fetched when on groups scope' );
+
+                // clean up!
+                $activities_template = $reset_activities_template;
+        }
+
+        /**
+         * @group scope
+         * @group filter_query
+         * @group BP_Activity_Query
+         */
+        function test_bp_has_activities_scope_mentions_no_items() {
+                $u1 = $this->factory->user->create();
+
+                $now = time();
+
+                // Create a random activity
+                $a1 = $this->factory->activity->create( array(
+                        'user_id' => $u1,
+                        'type' => 'activity_update',
+                        'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+                ) );
+
+                global $activities_template;
+                $reset_activities_template = $activities_template;
+
+                // grab activities from mentions scope
+                bp_has_activities( array(
+                        'user_id' => $u1,
+                        'scope' => 'mentions',
+                ) );
+
+                // assert!
+                $this->assertEmpty( $activities_template->activities, 'When a user has no mention, no activities should be fetched when on the mentions scope' );
+
+                // clean up!
+                $activities_template = $reset_activities_template;
+        }
+
+        /**
          * @group filter_query
          * @group BP_Activity_Query
          */