Changeset 9120

Timestamp:

11/03/2014 06:14:06 PM (12 years ago)

Author:

djpaul

Message:

Unit Tests, Groups: update the group factory to set the group's creator_id if one was not passed to the factory.

This is a quicker way of updating hundreds of unit tests where we've previously had a bug that was creating Groups without a valid group creator being set. See #5983 for related changes.

A few tests are counting the number of users in specific circumstances, so those eight tests have been individually updated so that they pass a valid creator_id without us having to refactor the entire test.

The test_group_has_no_members test has also been removed as it is impossible for a group to have no members. This test used to work because of this bug.

Location:

trunk/tests/phpunit

Files:

• includes/factory.php (modified) (2 diffs)
• testcases/groups/class-bp-group-member-query.php (modified) (6 diffs)
• testcases/groups/template.php (modified) (1 diff)

trunk/tests/phpunit/includes/factory.php

@@ -71 +71 @@
         function create_object( $args ) {
                 if ( ! isset( $args['creator_id'] ) ) {
-                        $args['creator_id'] = get_current_user_id();
+                        if ( is_user_logged_in() ) {
+                                $args['creator_id'] = get_current_user_id();
+
+                        // Create a user. This is based on from BP_UnitTestCase->create_user().
+                        } else {
+                                $last_activity      = date( 'Y-m-d H:i:s', strtotime( bp_core_current_time() ) - 60 * 60 * 24 * 365 );
+                                $user_factory       = new WP_UnitTest_Factory_For_User();
+                                $args['creator_id'] = $this->factory->user->create( array( 'role' => 'subscriber' ) );
+
+                                bp_update_user_last_activity( $args['creator_id'] , $last_activity );
+
+                                if ( bp_is_active( 'xprofile' ) ) {
+                                        $user = new WP_User( $args['creator_id']  );
+                                        xprofile_set_field_data( 1, $args['creator_id'] , $user->display_name );
+                                }
+                        }
                 }
 
@@ -80 +95 @@
 
                 groups_update_groupmeta( $group_id, 'total_member_count', 1 );
-
                 $last_activity = isset( $args['last_activity'] ) ? $args['last_activity'] : bp_core_current_time();
                 groups_update_groupmeta( $group_id, 'last_activity', $last_activity );

trunk/tests/phpunit/testcases/groups/class-bp-group-member-query.php

@@ -119 +119 @@
 
         public function test_with_group_role_admin() {
-                $g = $this->factory->group->create();
-                $u1 = $this->create_user();
-                $u2 = $this->create_user();
-                $u3 = $this->create_user();
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+                $u3 = $this->create_user();
+                $g  = $this->factory->group->create( array(
+                        'creator_id' => $u1
+                ) );
                 $time = time();
 
@@ -169 +171 @@
 
         public function test_with_group_role_member_admin() {
-                $g = $this->factory->group->create();
-                $u1 = $this->create_user();
-                $u2 = $this->create_user();
-                $u3 = $this->create_user();
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+                $u3 = $this->create_user();
+                $g  = $this->factory->group->create( array(
+                        'creator_id' => $u1,
+                ) );
                 $time = time();
 
@@ -194 +198 @@
 
         public function test_with_group_role_mod_admin() {
-                $g = $this->factory->group->create();
-                $u1 = $this->create_user();
-                $u2 = $this->create_user();
-                $u3 = $this->create_user();
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+                $u3 = $this->create_user();
+                $g  = $this->factory->group->create( array(
+                        'creator_id' => $u1,
+                ) );
                 $time = time();
 
@@ -219 +225 @@
 
         public function test_with_group_role_member_mod_admin() {
-                $g = $this->factory->group->create();
-                $u1 = $this->create_user();
-                $u2 = $this->create_user();
-                $u3 = $this->create_user();
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+                $u3 = $this->create_user();
+                $g  = $this->factory->group->create( array(
+                        'creator_id' => $u1,
+                ) );
                 $time = time();
 
@@ -244 +252 @@
 
         public function test_with_group_role_member_mod_admin_banned() {
-                $g = $this->factory->group->create();
                 $u1 = $this->create_user();
                 $u2 = $this->create_user();
                 $u3 = $this->create_user();
                 $u4 = $this->create_user();
+                $g  = $this->factory->group->create( array(
+                        'creator_id' => $u1,
+                ) );
                 $time = time();
 
@@ -294 +304 @@
                 $ids = wp_parse_id_list( array_keys( $query_members->results ) );
                 $this->assertEquals( array( $u1, ), $ids );
-        }
-
-        public function test_group_has_no_members() {
-                $g = $this->factory->group->create();
-                $u1 = $this->create_user();
-
-                $query_members = new BP_Group_Member_Query( array(
-                        'group_id' => $g,
-                        'group_role' => array( 'member', 'mod', 'admin' ),
-                ) );
-
-                $ids = wp_parse_id_list( array_keys( $query_members->results ) );
-                $this->assertEquals( array(), $ids );
         }
 

trunk/tests/phpunit/testcases/groups/template.php

@@ -132 +132 @@
          */
         public function test_bp_group_has_members_vanilla() {
-                $g = $this->factory->group->create();
                 $u1 = $this->create_user();
                 $u2 = $this->create_user();
+                $g  = $this->factory->group->create( array(
+                        'creator_id' => $u1,
+                ) );
 
                 $this->add_user_to_group( $u1, $g );