Changeset 8237

Timestamp:

04/04/2014 07:47:59 PM (11 years ago)

Author:

boonebgorges

Message:

Don't do a strict type check when deciding on bp_activity_add_user_favorite() return value

Since r8132, bp_activity_update_meta() has returned an integer value when
falling through to add_metadata(). Thus, we should have a more generous test
for whether the update has been successful. See #5399

Fixes #5515

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (1 diff)
• tests/testcases/activity/functions.php (modified) (1 diff)

trunk/bp-activity/bp-activity-functions.php

@@ -428 +428 @@
 
     // Update activity meta counts
-    if ( true === bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count ) ) {
+    if ( bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count ) ) {
 
         // Execute additional code

trunk/tests/testcases/activity/functions.php

@@ -704 +704 @@
         $a = $this->factory->activity->create();
 
-        bp_activity_add_user_favorite( $a, $u );
+        $this->assertTrue( bp_activity_add_user_favorite( $a, $u ) );
 
         $this->assertFalse( bp_activity_add_user_favorite( $a, $u ) );
         $this->assertSame( array( $a ), bp_activity_get_user_favorites( $u ) );
         $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
+    }
+
+    /**
+     * @group favorites
+     * @group bp_activity_add_user_favorite
+     */
+    public function test_add_user_favorite_not_yet_favorited() {
+        $u = $this->create_user();
+        $a = $this->factory->activity->create();
+        $this->assertTrue( bp_activity_add_user_favorite( $a, $u ) );
     }