Changeset 7155 for trunk/tests/testcases/activity/class.BP_Activity_Activity.php

Timestamp:

06/04/2013 06:13:29 PM (12 years ago)

Author:

boonebgorges

Message:

In test_get_with_display_comments_stream(), don't use bp_activity_new_comment()

The latter function does not accept a recorded_time argument - the current time
is assumed. As a result, on some systems (eg Travis) that run the tests fairly
slowly, the reverse chronological sort order of BP_Activity_Activity::get()
gets messed up, and the test fails. Calling bp_activity_add() directly allows
us to specify the correct recorded_time, fixing the test.

File:

• trunk/tests/testcases/activity/class.BP_Activity_Activity.php (modified) (2 diffs)

trunk/tests/testcases/activity/class.BP_Activity_Activity.php

@@ -162 +162 @@
             'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
         ) );
+
+        // bp_activity_new_comment() doesn't allow date_recorded
+        $a3 = bp_activity_add( array(
+            'action'            => sprintf( __( '%s posted a new activity comment', 'buddypress' ), bp_get_loggedin_user_link() ) ,
+            'content'           => 'Candy is good',
+            'component'         => buddypress()->activity->id,
+            'type'              => 'activity_comment',
+            'user_id'           => bp_loggedin_user_id,
+            'item_id'           => $a1,
+            'secondary_item_id' => $a1,
+            'recorded_time'     => date( 'Y-m-d H:i:s', $now - 50 ),
+        ) );
+
+        $activity = BP_Activity_Activity::get( array(
+            'display_comments' => 'stream',
+        ) );
+        $ids = wp_list_pluck( $activity['activities'], 'id' );
+        $this->assertEquals( array( $a1, $a3, $a2 ), $ids );
+    }
+
+    /**
+     * @group get
+     */
+    public function test_get_with_display_comments_false() {
+        $now = time();
+        $a1 = $this->factory->activity->create( array(
+            'content' => 'Life Rules',
+            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+        ) );
+        $a2 = $this->factory->activity->create( array(
+            'content' => 'Life Drools',
+            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
+        ) );
         $a3 = bp_activity_new_comment( array(
             'activity_id' => $a1,
@@ -169 +202 @@
 
         $activity = BP_Activity_Activity::get( array(
-            'display_comments' => 'stream',
-        ) );
-        $ids = wp_list_pluck( $activity['activities'], 'id' );
-        $this->assertEquals( array( $a1, $a3, $a2 ), $ids );
-    }
-
-    /**
-     * @group get
-     */
-    public function test_get_with_display_comments_false() {
-        $now = time();
-        $a1 = $this->factory->activity->create( array(
-            'content' => 'Life Rules',
-            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
-        ) );
-        $a2 = $this->factory->activity->create( array(
-            'content' => 'Life Drools',
-            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
-        ) );
-        $a3 = bp_activity_new_comment( array(
-            'activity_id' => $a1,
-            'content' => 'Candy is good',
-            'recorded_time' => date( 'Y-m-d H:i:s', $now - 50 ),
-        ) );
-
-        $activity = BP_Activity_Activity::get( array(
             'display_comments' => false,
         ) );