Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
08/12/2019 08:42:49 PM (7 years ago)
Author:
dcavins
Message:

Introduce BP_Groups_Invitation_Manager.

  • Add BP_Groups_Invitation_Manager, a new class that extends BP_Invitation_Manager for the purpose of using the new API to manage group invitations and requests.
  • Migrate group invitations to the new table on update, via bp_groups_migrate_invitations().
  • Update group invitation function logic to make use of BP_Groups_Invitation_Manager.

See #6210.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/testcases/groups/functions.php

    r12328 r12429  
    1313        self::$group_ids = $factory->group->create_many( 2, array(
    1414            'creator_id' => self::$user_ids[2],
     15            'status'     => 'private'
    1516        ) );
    1617    }
     
    115116        $u1 = self::factory()->user->create();
    116117        $u2 = self::factory()->user->create();
    117         $g = self::factory()->group->create();
     118        $g = self::factory()->group->create( array( 'status' => 'private', 'creator_id' => $u2 ) );
     119
    118120        groups_invite_user( array(
    119121            'user_id' => $u1,
    120122            'group_id' => $g,
    121123            'inviter_id' => $u2,
    122         ) );
    123 
    124         groups_accept_invite( $u2, $g );
    125 
    126         $this->assertEquals( 1, bp_get_user_meta( $u2, 'total_group_count', true ) );
     124            'send_invite' => 1,
     125        ) );
     126
     127        groups_accept_invite( $u1, $g );
     128
     129        $this->assertEquals( 1, bp_get_user_meta( $u1, 'total_group_count', true ) );
    127130    }
    128131
     
    138141        $this->set_current_user( $u2 );
    139142
    140         $g = self::factory()->group->create();
    141         groups_send_membership_request( $u1, $g );
     143        $g = self::factory()->group->create( array( 'status' => 'private' ) );
     144        groups_send_membership_request( array(
     145            'user_id'       => $u1,
     146            'group_id'      => $g,
     147        ) );
    142148
    143149        groups_accept_membership_request( 0, $u1, $g );
     
    242248        $u1 = self::factory()->user->create();
    243249        $u2 = self::factory()->user->create();
    244         $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     250        $g = self::factory()->group->create( array( 'status' => 'private', 'creator_id' => $u1 ) );
    245251        groups_invite_user( array(
    246             'user_id' => $u1,
    247             'group_id' => $g,
    248             'inviter_id' => $u2,
     252            'user_id'     => $u2,
     253            'group_id'    => $g,
     254            'inviter_id'  => $u1,
     255            'send_invite' => 1,
    249256        ) );
    250257
     
    261268        $u1 = self::factory()->user->create();
    262269        $u2 = self::factory()->user->create();
    263         $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    264 
    265         groups_send_membership_request( $u2, $g );
     270        $g = self::factory()->group->create( array( 'status' => 'private', 'creator_id' => $u1 ) );
     271
     272        groups_send_membership_request( array(
     273            'user_id'       => $u2,
     274            'group_id'      => $g,
     275        ) );
    266276        groups_accept_membership_request( 0, $u2, $g );
    267277
     
    633643        $u1 = self::factory()->user->create();
    634644        $u2 = self::factory()->user->create();
    635         $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     645        $g = self::factory()->group->create( array( 'creator_id' => $u1, 'status' => 'private' ) );
    636646
    637647        // create invitation
     
    640650            'group_id'   => $g,
    641651            'inviter_id' => $u1,
    642         ) );
    643 
    644         // send the invite
    645         // this function is imperative to set the 'invite_sent' flag in the DB
    646         // why is this separated from groups_invite_user()?
    647         // @see groups_screen_group_invite()
    648         groups_send_invites( $u1, $g );
     652            'send_invite' => 1
     653        ) );
    649654
    650655        // assert invite count
     
    891896     */
    892897    public function test_bp_groups_pending_requests_personal_data_exporter() {
    893         groups_send_membership_request( self::$user_ids[0], self::$group_ids[0] );
     898        groups_send_membership_request( array(
     899            'user_id'       => self::$user_ids[0],
     900            'group_id'      => self::$group_ids[0],
     901        ) );
    894902
    895903        $test_user = new WP_User( self::$user_ids[0] );
     
    908916    public function test_bp_groups_pending_sent_invitations_personal_data_exporter() {
    909917        groups_invite_user( array(
    910             'user_id'    => self::$user_ids[1],
    911             'group_id'   => self::$group_ids[0],
    912             'inviter_id' => self::$user_ids[0],
    913         ) );
    914 
    915         $test_user = new WP_User( self::$user_ids[0] );
     918            'user_id'     => self::$user_ids[0],
     919            'group_id'    => self::$group_ids[0],
     920            'inviter_id'  => self::$user_ids[2],
     921            'send_invite' => 1,
     922        ) );
     923
     924        $test_user = new WP_User( self::$user_ids[2] );
    916925
    917926        $actual = bp_groups_pending_sent_invitations_personal_data_exporter( $test_user->user_email, 1 );
     
    930939            'user_id'    => self::$user_ids[0],
    931940            'group_id'   => self::$group_ids[0],
    932             'inviter_id' => self::$user_ids[1],
     941            'inviter_id' => self::$user_ids[2],
    933942        ) );
    934943
Note: See TracChangeset for help on using the changeset viewer.