Ticket #6720: 6720-tests.diff

tests/phpunit/testcases/activity/template.php

@@ -525 +525 @@
         }
 
         /**
+         * @group scope
+         */
+        function test_bp_has_activities_scope_friends_shoud_respect_id_order_when_record_dates_are_same() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+
+                friends_add_friend( $u1, $u2, true );
+
+                // Friend's very fast status updates.
+                $a1 = $this->factory->activity->create( array(
+                        'user_id' => $u2,
+                        'type' => 'activity_update',
+                        'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+                ) );
+                $a2 = $this->factory->activity->create( array(
+                        'user_id' => $u2,
+                        'type' => 'activity_update',
+                        'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+                ) );
+
+                global $activities_template;
+                $reset_activities_template = $activities_template;
+
+                // Get activities in 'friends' scope
+                bp_has_activities( array(
+                        'user_id' => $u1,
+                        'scope' => 'friends',
+                ) );
+
+                $this->assertEquals( array( $a2, $a1 ), wp_list_pluck( $activities_template->activities, 'id' ) );
+
+                // Clean up!
+                $activities_template = $reset_activities_template;
+        }
+
+        /**
+         * @group scope
+         */
+        function test_bp_has_activities_scope_groups_shoud_respect_id_order_when_record_dates_are_same() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $u3 = $this->factory->user->create();
+
+                $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
+
+                // Two user join first user's group same time
+                $a1 = $this->factory->activity->create( array(
+                        'user_id'   => $u2,
+                        'component' => 'groups',
+                        'item_id'   => $g1,
+                        'type'      => 'joined_group',
+                        'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+                ) );
+                $a2 = $this->factory->activity->create( array(
+                        'user_id'   => $u3,
+                        'component' => 'groups',
+                        'item_id'   => $g1,
+                        'type'      => 'joined_group',
+                        'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
+                ) );
+
+
+                global $activities_template;
+                $reset_activities_template = $activities_template;
+
+                // Get activities in 'groups' scope
+                bp_has_activities( array(
+                        'user_id' => $u1,
+                        'scope' => 'groups',
+                ) );
+
+                $this->assertEquals( array( $a2, $a1 ), wp_list_pluck( $activities_template->activities, 'id' ) );
+
+                // Clean up!
+                $activities_template = $reset_activities_template;
+        }
+
+        /**
          * @group filter_query
          * @group BP_Activity_Query
          */