Changeset 7050 for trunk/tests/testcases/groups/class-bp-groups-member.php

Timestamp:

05/09/2013 02:22:04 PM (13 years ago)

Author:

boonebgorges

Message:

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

For better parity with other factories

File:

• trunk/tests/testcases/groups/class-bp-groups-member.php (modified) (7 diffs)

trunk/tests/testcases/groups/class-bp-groups-member.php

@@ -48 +48 @@
 
                 $u = $this->factory->user->create();
-                self::add_user_to_group( $u, $g1->id );
-                self::add_user_to_group( $u, $g2->id );
+                self::add_user_to_group( $u, $g1 );
+                self::add_user_to_group( $u, $g2 );
 
                 $groups = BP_Groups_Member::get_recently_joined( $u, false, false, 'Rite' );
 
                 $ids = wp_list_pluck( $groups['groups'], 'id' );
-                $this->assertEquals( $ids, array( $g2->id ) );
+                $this->assertEquals( $ids, array( $g2 ) );
         }
 
@@ -66 +66 @@
 
                 $u = $this->factory->user->create();
-                self::add_user_to_group( $u, $g1->id );
-                self::add_user_to_group( $u, $g2->id );
+                self::add_user_to_group( $u, $g1 );
+                self::add_user_to_group( $u, $g2 );
 
-                $m1 = new BP_Groups_Member( $u, $g1->id );
+                $m1 = new BP_Groups_Member( $u, $g1 );
                 $m1->promote( 'admin' );
-                $m2 = new BP_Groups_Member( $u, $g2->id );
+                $m2 = new BP_Groups_Member( $u, $g2 );
                 $m2->promote( 'admin' );
 
@@ -77 +77 @@
 
                 $ids = wp_list_pluck( $groups['groups'], 'id' );
-                $this->assertEquals( $ids, array( $g2->id ) );
+                $this->assertEquals( $ids, array( $g2 ) );
         }
 
@@ -89 +89 @@
 
                 $u = $this->factory->user->create();
-                self::add_user_to_group( $u, $g1->id );
-                self::add_user_to_group( $u, $g2->id );
+                self::add_user_to_group( $u, $g1 );
+                self::add_user_to_group( $u, $g2 );
 
-                $m1 = new BP_Groups_Member( $u, $g1->id );
+                $m1 = new BP_Groups_Member( $u, $g1 );
                 $m1->promote( 'mod' );
-                $m2 = new BP_Groups_Member( $u, $g2->id );
+                $m2 = new BP_Groups_Member( $u, $g2 );
                 $m2->promote( 'mod' );
 
@@ -100 +100 @@
 
                 $ids = wp_list_pluck( $groups['groups'], 'id' );
-                $this->assertEquals( $ids, array( $g2->id ) );
+                $this->assertEquals( $ids, array( $g2 ) );
         }
 
@@ -113 +113 @@
                 $u1 = $this->factory->user->create();
                 $u2 = $this->factory->user->create();
-                self::add_user_to_group( $u1, $g1->id );
-                self::add_user_to_group( $u1, $g2->id );
-                self::invite_user_to_group( $u2, $g1->id, $u1 );
-                self::invite_user_to_group( $u2, $g2->id, $u1 );
+                self::add_user_to_group( $u1, $g1 );
+                self::add_user_to_group( $u1, $g2 );
+                self::invite_user_to_group( $u2, $g1, $u1 );
+                self::invite_user_to_group( $u2, $g2, $u1 );
 
-                $groups = BP_Groups_Member::get_invites( $u2, false, false, array( 'awesome', $g1->id ) );
+                $groups = BP_Groups_Member::get_invites( $u2, false, false, array( 'awesome', $g1 ) );
 
                 $ids = wp_list_pluck( $groups['groups'], 'id' );
-                $this->assertEquals( $ids, array( $g2->id ) );
+                $this->assertEquals( $ids, array( $g2 ) );
         }
 
@@ -129 +129 @@
                 $u1 = $this->create_user();
                 $u2 = $this->create_user();
-                self::add_user_to_group( $u1, $g1->id );
-                self::add_user_to_group( $u2, $g1->id );
+                self::add_user_to_group( $u1, $g1 );
+                self::add_user_to_group( $u2, $g1 );
 
-                $members = BP_Groups_Member::get_all_for_group( $g1->id, false, false, true, true, array( $u1 ) );
+                $members = BP_Groups_Member::get_all_for_group( $g1, false, false, true, true, array( $u1 ) );
 
                 $mm = (array) $members['members'];