Changeset 7047 for trunk/tests/testcases/activity/template.php

Timestamp:

05/09/2013 02:11:52 PM (12 years ago)

Author:

boonebgorges

Message:

In test suite, factory->activity->create() should return an id, not an object

Two reasons: The value that's almost always needed is an ID, and it's more
consistent with WP's factories.

File:

• trunk/tests/testcases/activity/template.php (modified) (6 diffs)

trunk/tests/testcases/activity/template.php

@@ -24 +24 @@
         global $bp;
 
-        $activity = $this->factory->activity->create( array(
+        $a = $this->factory->activity->create( array(
             'type' => 'activity_update',
         ) );
 
         // User can delete his own items
+        $activity = $this->factory->activity->get_object_by_id( $a );
         $this->assertTrue( bp_activity_user_can_delete( $activity ) );
 
@@ -75 +76 @@
         ) );
 
-        bp_activity_add_user_favorite( $a1->id, $user_id );
-        bp_activity_add_user_favorite( $a2->id, $user_id );
+        bp_activity_add_user_favorite( $a1, $user_id );
+        bp_activity_add_user_favorite( $a2, $user_id );
 
         // groan. It sucks that you have to invoke the global
@@ -92 +93 @@
         $ids = wp_list_pluck( $activities_template->activities, 'id' );
 
-        $this->assertEquals( $ids, array( $a1->id, $a2->id ) );
+        $this->assertEquals( $ids, array( $a1, $a2 ) );
 
         $activities_template = null;
@@ -107 +108 @@
         $ids = wp_list_pluck( $activities_template->activities, 'id' );
 
-        $this->assertEquals( $ids, array( $a1->id ) );
+        $this->assertEquals( $ids, array( $a1 ) );
 
         $activities_template = null;
@@ -118 +119 @@
         $a1 = $this->factory->activity->create();
         $a2 = $this->factory->activity->create();
-        bp_activity_update_meta( $a1->id, 'foo', 'bar' );
+        bp_activity_update_meta( $a1, 'foo', 'bar' );
 
         global $activities_template;
@@ -131 +132 @@
 
         $ids = wp_list_pluck( $activities_template->activities, 'id' );
-        $this->assertEquals( $ids, array( $a1->id ) );
+        $this->assertEquals( $ids, array( $a1 ) );
     }
 }