Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
11/03/2017 07:44:10 PM (7 years ago)
Author:
boonebgorges
Message:

Use static factory method throughout PHPUnit tests.

See #7620.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r11609 r11737  
    3131
    3232    public function test_get_recently_joined_with_filter() {
    33         $g1 = $this->factory->group->create( array(
     33        $g1 = self::factory()->group->create( array(
    3434            'name' => 'Tab',
    3535        ) );
    36         $g2 = $this->factory->group->create( array(
     36        $g2 = self::factory()->group->create( array(
    3737            'name' => 'Diet Rite',
    3838        ) );
    3939
    40         $u = $this->factory->user->create();
     40        $u = self::factory()->user->create();
    4141        self::add_user_to_group( $u, $g1 );
    4242        self::add_user_to_group( $u, $g2 );
    … …  
    4949
    5050    public function test_get_is_admin_of_with_filter() {
    51         $g1 = $this->factory->group->create( array(
     51        $g1 = self::factory()->group->create( array(
    5252            'name' => 'RC Cola',
    5353        ) );
    54         $g2 = $this->factory->group->create( array(
     54        $g2 = self::factory()->group->create( array(
    5555            'name' => 'Pepsi',
    5656        ) );
    5757
    58         $u = $this->factory->user->create();
     58        $u = self::factory()->user->create();
    5959        self::add_user_to_group( $u, $g1 );
    6060        self::add_user_to_group( $u, $g2 );
    … …  
    7272
    7373    public function test_get_is_mod_of_with_filter() {
    74         $g1 = $this->factory->group->create( array(
     74        $g1 = self::factory()->group->create( array(
    7575            'name' => 'RC Cola',
    7676        ) );
    77         $g2 = $this->factory->group->create( array(
     77        $g2 = self::factory()->group->create( array(
    7878            'name' => 'Pepsi',
    7979        ) );
    8080
    81         $u = $this->factory->user->create();
     81        $u = self::factory()->user->create();
    8282        self::add_user_to_group( $u, $g1 );
    8383        self::add_user_to_group( $u, $g2 );
    … …  
    9595
    9696    public function test_get_is_banned_of_with_filter() {
    97         $g1 = $this->factory->group->create( array(
     97        $g1 = self::factory()->group->create( array(
    9898            'name' => 'RC Cola',
    9999        ) );
    100         $g2 = $this->factory->group->create( array(
     100        $g2 = self::factory()->group->create( array(
    101101            'name' => 'Pepsi',
    102102        ) );
    103103
    104         $u = $this->factory->user->create();
     104        $u = self::factory()->user->create();
    105105        self::add_user_to_group( $u, $g1 );
    106106        self::add_user_to_group( $u, $g2 );
    … …  
    118118
    119119    public function test_get_invites_with_exclude() {
    120         $g1 = $this->factory->group->create( array(
     120        $g1 = self::factory()->group->create( array(
    121121            'name' => 'RC Cola',
    122122        ) );
    123         $g2 = $this->factory->group->create( array(
     123        $g2 = self::factory()->group->create( array(
    124124            'name' => 'Pepsi',
    125125        ) );
    126126
    127         $u1 = $this->factory->user->create();
    128         $u2 = $this->factory->user->create();
     127        $u1 = self::factory()->user->create();
     128        $u2 = self::factory()->user->create();
    129129        self::add_user_to_group( $u1, $g1 );
    130130        self::add_user_to_group( $u1, $g2 );
    … …  
    142142     */
    143143    public function test_get_all_for_group_with_exclude() {
    144         $g1 = $this->factory->group->create();
    145 
    146         $u1 = $this->factory->user->create();
    147         $u2 = $this->factory->user->create();
     144        $g1 = self::factory()->group->create();
     145
     146        $u1 = self::factory()->user->create();
     147        $u2 = self::factory()->user->create();
    148148        self::add_user_to_group( $u1, $g1 );
    149149        self::add_user_to_group( $u2, $g1 );
    … …  
    160160     */
    161161    public function test_bp_groups_user_can_send_invites() {
    162         $u_nonmembers = $this->factory->user->create();
    163         $u_members    = $this->factory->user->create();
    164         $u_mods       = $this->factory->user->create();
    165         $u_admins     = $this->factory->user->create();
    166         $u_siteadmin  = $this->factory->user->create();
     162        $u_nonmembers = self::factory()->user->create();
     163        $u_members    = self::factory()->user->create();
     164        $u_mods       = self::factory()->user->create();
     165        $u_admins     = self::factory()->user->create();
     166        $u_siteadmin  = self::factory()->user->create();
    167167
    168168        $user_siteadmin = new WP_User( $u_siteadmin );
    169169        $user_siteadmin->add_role( 'administrator' );
    170170
    171         $g = $this->factory->group->create();
     171        $g = self::factory()->group->create();
    172172
    173173        $time = time() - 60;
    … …  
    261261     */
    262262    public function test_bp_groups_reject_membership_request_remove_request() {
    263         $u1 = $this->factory->user->create();
    264         $g = $this->factory->group->create( array(
     263        $u1 = self::factory()->user->create();
     264        $g = self::factory()->group->create( array(
    265265            'status' => 'private',
    266266        ) );
    … …  
    279279     */
    280280    public function test_bp_groups_reject_membership_request_leave_memberships_intact() {
    281         $u1 = $this->factory->user->create();
    282         $g = $this->factory->group->create( array(
     281        $u1 = self::factory()->user->create();
     282        $g = self::factory()->group->create( array(
    283283            'status' => 'private',
    284284        ) );
    … …  
    298298     */
    299299    public function test_bp_groups_reject_membership_request_leave_invites_intact() {
    300         $u1 = $this->factory->user->create();
    301         $u2 = $this->factory->user->create();
    302         $g = $this->factory->group->create( array(
     300        $u1 = self::factory()->user->create();
     301        $u2 = self::factory()->user->create();
     302        $g = self::factory()->group->create( array(
    303303            'status' => 'private',
    304304        ) );
    … …  
    322322     */
    323323    public function test_bp_groups_delete_membership_request_remove_request() {
    324         $u1 = $this->factory->user->create();
    325         $g = $this->factory->group->create( array(
     324        $u1 = self::factory()->user->create();
     325        $g = self::factory()->group->create( array(
    326326            'status' => 'private',
    327327        ) );
    … …  
    340340     */
    341341    public function test_bp_groups_delete_membership_request_leave_memberships_intact() {
    342         $u1 = $this->factory->user->create();
    343         $g = $this->factory->group->create( array(
     342        $u1 = self::factory()->user->create();
     343        $g = self::factory()->group->create( array(
    344344            'status' => 'private',
    345345        ) );
    … …  
    359359     */
    360360    public function test_bp_groups_delete_membership_request_leave_invites_intact() {
    361         $u1 = $this->factory->user->create();
    362         $u2 = $this->factory->user->create();
    363         $g = $this->factory->group->create( array(
     361        $u1 = self::factory()->user->create();
     362        $u2 = self::factory()->user->create();
     363        $g = self::factory()->group->create( array(
    364364            'status' => 'private',
    365365        ) );
    … …  
    383383     */
    384384    public function test_bp_groups_reject_invite_remove_invite() {
    385         $u1 = $this->factory->user->create();
    386         $u2 = $this->factory->user->create();
    387         $g = $this->factory->group->create( array(
     385        $u1 = self::factory()->user->create();
     386        $u2 = self::factory()->user->create();
     387        $g = self::factory()->group->create( array(
    388388            'status' => 'private',
    389389        ) );
    … …  
    407407     */
    408408    public function test_bp_groups_reject_invite_leave_memberships_intact() {
    409         $u1 = $this->factory->user->create();
    410         $g = $this->factory->group->create( array(
     409        $u1 = self::factory()->user->create();
     410        $g = self::factory()->group->create( array(
    411411            'status' => 'private',
    412412        ) );
    … …  
    429429     */
    430430    public function test_bp_groups_reject_invite_leave_requests_intact() {
    431         $u1 = $this->factory->user->create();
    432         $g = $this->factory->group->create( array(
     431        $u1 = self::factory()->user->create();
     432        $g = self::factory()->group->create( array(
    433433            'status' => 'private',
    434434        ) );
    … …  
    447447     */
    448448    public function test_bp_groups_delete_invite_remove_invite() {
    449         $u1 = $this->factory->user->create();
    450         $u2 = $this->factory->user->create();
    451         $g = $this->factory->group->create( array(
     449        $u1 = self::factory()->user->create();
     450        $u2 = self::factory()->user->create();
     451        $g = self::factory()->group->create( array(
    452452            'status' => 'private',
    453453        ) );
    … …  
    471471     */
    472472    public function test_bp_groups_delete_invite_remove_draft_invite() {
    473         $u1 = $this->factory->user->create();
    474         $u2 = $this->factory->user->create();
    475         $g  = $this->factory->group->create( array(
     473        $u1 = self::factory()->user->create();
     474        $u2 = self::factory()->user->create();
     475        $g  = self::factory()->group->create( array(
    476476            'status' => 'private',
    477477        ) );
    … …  
    505505     */
    506506    public function test_bp_groups_delete_invite_leave_memberships_intact() {
    507         $u1 = $this->factory->user->create();
    508         $g  = $this->factory->group->create( array(
     507        $u1 = self::factory()->user->create();
     508        $g  = self::factory()->group->create( array(
    509509            'status' => 'private',
    510510        ) );
    … …  
    526526     */
    527527    public function test_bp_groups_delete_invite_leave_requests_intact() {
    528         $u1 = $this->factory->user->create();
    529         $g = $this->factory->group->create( array(
     528        $u1 = self::factory()->user->create();
     529        $g = self::factory()->group->create( array(
    530530            'status' => 'private',
    531531        ) );
    … …  
    544544     */
    545545    public function test_bp_groups_uninvite_user_remove_invite() {
    546         $u1 = $this->factory->user->create();
    547         $u2 = $this->factory->user->create();
    548         $g = $this->factory->group->create( array(
     546        $u1 = self::factory()->user->create();
     547        $u2 = self::factory()->user->create();
     548        $g = self::factory()->group->create( array(
    549549            'status' => 'private',
    550550        ) );
    … …  
    568568     */
    569569    public function test_bp_groups_uninvite_user_leave_memberships_intact() {
    570         $u1 = $this->factory->user->create();
    571         $g = $this->factory->group->create( array(
     570        $u1 = self::factory()->user->create();
     571        $g = self::factory()->group->create( array(
    572572            'status' => 'private',
    573573        ) );
    … …  
    591591     */
    592592    public function test_bp_groups_uninvite_user_leave_requests_intact() {
    593         $u1 = $this->factory->user->create();
    594         $g = $this->factory->group->create( array(
     593        $u1 = self::factory()->user->create();
     594        $g = self::factory()->group->create( array(
    595595            'status' => 'private',
    596596        ) );
    … …  
    608608     */
    609609    public function test_groups_join_group_basic_join() {
    610         $u1 = $this->factory->user->create();
    611         $g = $this->factory->group->create();
     610        $u1 = self::factory()->user->create();
     611        $g = self::factory()->group->create();
    612612
    613613        groups_join_group( $g, $u1 );
    … …  
    621621     */
    622622    public function test_groups_join_group_basic_join_use_current_user() {
    623         $u1 = $this->factory->user->create();
    624         $g = $this->factory->group->create();
     623        $u1 = self::factory()->user->create();
     624        $g = self::factory()->group->create();
    625625        $old_current_user = get_current_user_id();
    626626        $this->set_current_user( $u1 );
    … …  
    637637     */
    638638    public function test_groups_join_group_already_member() {
    639         $u1 = $this->factory->user->create();
    640         $g = $this->factory->group->create();
     639        $u1 = self::factory()->user->create();
     640        $g = self::factory()->group->create();
    641641        $this->add_user_to_group( $u1, $g );
    642642
    … …  
    649649     */
    650650    public function test_groups_join_group_cleanup_invites() {
    651         $u1 = $this->factory->user->create();
    652         $u2 = $this->factory->user->create();
    653         $g = $this->factory->group->create();
     651        $u1 = self::factory()->user->create();
     652        $u2 = self::factory()->user->create();
     653        $g = self::factory()->group->create();
    654654        $this->add_user_to_group( $u1, $g );
    655655
    … …  
    669669     */
    670670    public function test_groups_join_group_cleanup_requests() {
    671         $u1 = $this->factory->user->create();
    672         $g = $this->factory->group->create();
     671        $u1 = self::factory()->user->create();
     672        $g = self::factory()->group->create();
    673673        self::create_group_membership_request( $u1, $g );
    674674
    … …  
    684684    public function test_groups_leave_group_basic_leave_self_initiated() {
    685685        $old_current_user = get_current_user_id();
    686         $u1 = $this->factory->user->create();
    687         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    688         $u2 = $this->factory->user->create();
     686        $u1 = self::factory()->user->create();
     687        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     688        $u2 = self::factory()->user->create();
    689689        $this->add_user_to_group( $u2, $g );
    690690
    … …  
    704704    public function test_groups_leave_group_basic_leave_use_current_user() {
    705705        $old_current_user = get_current_user_id();
    706         $u1 = $this->factory->user->create();
    707         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    708         $u2 = $this->factory->user->create();
     706        $u1 = self::factory()->user->create();
     707        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     708        $u2 = self::factory()->user->create();
    709709        $this->add_user_to_group( $u2, $g );
    710710
    … …  
    724724    public function test_groups_leave_group_basic_leave_group_admin_initiated() {
    725725        $old_current_user = get_current_user_id();
    726         $u1 = $this->factory->user->create();
    727         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    728         $u2 = $this->factory->user->create();
     726        $u1 = self::factory()->user->create();
     727        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     728        $u2 = self::factory()->user->create();
    729729        $this->add_user_to_group( $u2, $g );
    730730
    … …  
    744744    public function test_groups_leave_group_basic_leave_site_admin_initiated() {
    745745        $old_current_user = get_current_user_id();
    746         $u1 = $this->factory->user->create();
     746        $u1 = self::factory()->user->create();
    747747        $u1_siteadmin = new WP_User( $u1 );
    748748        $u1_siteadmin->add_role( 'administrator' );
    749         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    750         $u2 = $this->factory->user->create();
     749        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     750        $u2 = self::factory()->user->create();
    751751        $this->add_user_to_group( $u2, $g );
    752752
    … …  
    766766    public function test_groups_leave_group_single_admin_prevent_leave() {
    767767        $old_current_user = get_current_user_id();
    768         $u1 = $this->factory->user->create();
    769         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    770         $u2 = $this->factory->user->create();
     768        $u1 = self::factory()->user->create();
     769        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     770        $u2 = self::factory()->user->create();
    771771        $this->add_user_to_group( $u2, $g );
    772772
    … …  
    786786    public function test_groups_leave_group_multiple_admins_allow_leave() {
    787787        $old_current_user = get_current_user_id();
    788         $u1 = $this->factory->user->create();
    789         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    790         $u2 = $this->factory->user->create();
     788        $u1 = self::factory()->user->create();
     789        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     790        $u2 = self::factory()->user->create();
    791791        $this->add_user_to_group( $u2, $g );
    792792        $m2 = new BP_Groups_Member( $u2, $g );
    … …  
    808808     */
    809809    public function test_groups_get_invites_for_user() {
    810         $u1 = $this->factory->user->create();
    811         $u2 = $this->factory->user->create();
    812         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    813         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    814         $g3 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     810        $u1 = self::factory()->user->create();
     811        $u2 = self::factory()->user->create();
     812        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     813        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     814        $g3 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    815815
    816816        self::invite_user_to_group( $u2, $g1, $u1 );
    … …  
    831831        $old_current_user = get_current_user_id();
    832832
    833         $u1 = $this->factory->user->create();
    834         $u2 = $this->factory->user->create();
    835         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    836         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    837         $g3 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     833        $u1 = self::factory()->user->create();
     834        $u2 = self::factory()->user->create();
     835        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     836        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     837        $g3 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    838838
    839839        self::invite_user_to_group( $u2, $g1, $u1 );
    … …  
    854854     */
    855855    public function test_groups_get_invites_for_user_with_exclude() {
    856         $u1 = $this->factory->user->create();
    857         $u2 = $this->factory->user->create();
    858         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    859         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    860         $g3 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     856        $u1 = self::factory()->user->create();
     857        $u2 = self::factory()->user->create();
     858        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     859        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     860        $g3 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    861861
    862862        self::invite_user_to_group( $u2, $g1, $u1 );
    … …  
    874874     */
    875875    public function test_groups_get_invite_count_for_user() {
    876         $u1 = $this->factory->user->create();
    877         $u2 = $this->factory->user->create();
    878         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    879         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    880         $g3 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     876        $u1 = self::factory()->user->create();
     877        $u2 = self::factory()->user->create();
     878        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     879        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     880        $g3 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    881881
    882882        self::invite_user_to_group( $u2, $g1, $u1 );
    … …  
    893893     */
    894894    public function test_groups_get_invite_count_for_user_ignore_drafts() {
    895         $u1 = $this->factory->user->create();
    896         $u2 = $this->factory->user->create();
    897         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     895        $u1 = self::factory()->user->create();
     896        $u2 = self::factory()->user->create();
     897        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    898898
    899899        // Create draft invitation.
    … …  
    916916     */
    917917    public function test_groups_invite_user() {
    918         $u1 = $this->factory->user->create();
    919         $u2 = $this->factory->user->create();
    920         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     918        $u1 = self::factory()->user->create();
     919        $u2 = self::factory()->user->create();
     920        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    921921
    922922        // Create draft invitation
    … …  
    940940     */
    941941    public function test_groups_send_invites() {
    942         $u1 = $this->factory->user->create();
    943         $u2 = $this->factory->user->create();
    944         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     942        $u1 = self::factory()->user->create();
     943        $u2 = self::factory()->user->create();
     944        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    945945
    946946        // Create draft invitation
    … …  
    967967     */
    968968    public function test_groups_accept_invite() {
    969         $u1 = $this->factory->user->create();
    970         $u2 = $this->factory->user->create();
    971         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     969        $u1 = self::factory()->user->create();
     970        $u2 = self::factory()->user->create();
     971        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    972972
    973973        // Create draft invitation
    … …  
    10001000     */
    10011001    public function test_groups_accept_invite_removes_membership_requests() {
    1002         $u1 = $this->factory->user->create();
    1003         $u2 = $this->factory->user->create();
    1004         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1002        $u1 = self::factory()->user->create();
     1003        $u2 = self::factory()->user->create();
     1004        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    10051005
    10061006        // Create draft invitation
    … …  
    10351035     */
    10361036    public function test_groups_sent_invite_plus_request_equals_member() {
    1037         $u1 = $this->factory->user->create();
    1038         $u2 = $this->factory->user->create();
    1039         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1037        $u1 = self::factory()->user->create();
     1038        $u2 = self::factory()->user->create();
     1039        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    10401040
    10411041        // Create draft invitation
    … …  
    10651065     */
    10661066    public function test_groups_delete_all_group_invites() {
    1067         $u1 = $this->factory->user->create();
    1068         $u2 = $this->factory->user->create();
    1069         $u3 = $this->factory->user->create();
    1070         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1067        $u1 = self::factory()->user->create();
     1068        $u2 = self::factory()->user->create();
     1069        $u3 = self::factory()->user->create();
     1070        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    10711071
    10721072        self::invite_user_to_group( $u2, $g1, $u1 );
    … …  
    10921092     */
    10931093    public function test_groups_send_invites_fail_on_empty_group_id() {
    1094         $u1 = $this->factory->user->create();
    1095         $u2 = $this->factory->user->create();
     1094        $u1 = self::factory()->user->create();
     1095        $u2 = self::factory()->user->create();
    10961096
    10971097        // Create draft invitation with empty inviter_id
    … …  
    11131113     */
    11141114    public function test_groups_send_invites_fail_on_empty_user_id() {
    1115         $u1 = $this->factory->user->create();
    1116         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1115        $u1 = self::factory()->user->create();
     1116        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    11171117
    11181118        // Create draft invitation with empty inviter_id
    … …  
    11341134     */
    11351135    public function test_groups_send_invites_fail_on_empty_inviter_id() {
    1136         $u1 = $this->factory->user->create();
    1137         $u2 = $this->factory->user->create();
    1138         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1136        $u1 = self::factory()->user->create();
     1137        $u2 = self::factory()->user->create();
     1138        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    11391139
    11401140        // Create draft invitation with empty inviter_id
    … …  
    11571157     */
    11581158    public function test_groups_get_invites_for_group_with_sent_parameter() {
    1159         $u1 = $this->factory->user->create();
    1160         $u2 = $this->factory->user->create();
    1161         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1159        $u1 = self::factory()->user->create();
     1160        $u2 = self::factory()->user->create();
     1161        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    11621162
    11631163        // Create draft invitation
    … …  
    11921192     */
    11931193    public function test_groups_send_membership_request() {
    1194         $u1 = $this->factory->user->create();
    1195         $g1 = $this->factory->group->create();
     1194        $u1 = self::factory()->user->create();
     1195        $g1 = self::factory()->group->create();
    11961196
    11971197        // Create membership request
    … …  
    12081208     */
    12091209    public function test_groups_accept_membership_request_by_membership_id() {
    1210         $u1 = $this->factory->user->create();
    1211         $g1 = $this->factory->group->create();
     1210        $u1 = self::factory()->user->create();
     1211        $g1 = self::factory()->group->create();
    12121212
    12131213        // Create membership request
    … …  
    12311231     */
    12321232    public function test_groups_accept_membership_request_by_user_id_group_id() {
    1233         $u1 = $this->factory->user->create();
    1234         $g1 = $this->factory->group->create();
     1233        $u1 = self::factory()->user->create();
     1234        $g1 = self::factory()->group->create();
    12351235
    12361236        // Create membership request
    … …  
    12511251     */
    12521252    public function test_groups_membership_request_plus_invite_equals_member() {
    1253         $u1 = $this->factory->user->create();
    1254         $u2 = $this->factory->user->create();
    1255         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1253        $u1 = self::factory()->user->create();
     1254        $u2 = self::factory()->user->create();
     1255        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    12561256
    12571257        // Create membership request
    … …  
    12811281     */
    12821282    public function test_groups_accept_all_pending_membership_requests() {
    1283         $u1 = $this->factory->user->create();
    1284         $u2 = $this->factory->user->create();
    1285         $u3 = $this->factory->user->create();
    1286         $g1 = $this->factory->group->create();
     1283        $u1 = self::factory()->user->create();
     1284        $u2 = self::factory()->user->create();
     1285        $u3 = self::factory()->user->create();
     1286        $g1 = self::factory()->group->create();
    12871287
    12881288        // Create membership request
    … …  
    13101310     */
    13111311    public function test_get_memberships_by_id_with_single_id() {
    1312         $users = $this->factory->user->create_many( 2 );
    1313         $groups = $this->factory->group->create_many( 2 );
     1312        $users = self::factory()->user->create_many( 2 );
     1313        $groups = self::factory()->group->create_many( 2 );
    13141314
    13151315        $m0 = $this->add_user_to_group( $users[0], $groups[0] );
    … …  
    13261326     */
    13271327    public function test_get_memberships_by_id_with_multiple_ids() {
    1328         $users = $this->factory->user->create_many( 2 );
    1329         $groups = $this->factory->group->create_many( 2 );
     1328        $users = self::factory()->user->create_many( 2 );
     1329        $groups = self::factory()->group->create_many( 2 );
    13301330
    13311331        $m0 = $this->add_user_to_group( $users[0], $groups[0] );
    … …  
    13421342     */
    13431343    public function test_user_property_should_be_accessible() {
    1344         $user = $this->factory->user->create();
    1345         $group = $this->factory->group->create();
     1344        $user = self::factory()->user->create();
     1345        $group = self::factory()->group->create();
    13461346
    13471347        $this->add_user_to_group( $user, $group );
Note: See TracChangeset for help on using the changeset viewer.