Changeset 9471 for trunk/tests/phpunit/testcases/members/functions.php

Timestamp:

02/10/2015 02:49:16 AM (10 years ago)

Author:

johnjamesjacoby

Message:

Replace all remaining $bp global touches with buddypress().

All existing tests continue to pass as normal. I will further manually scrutinize each replacement to ensure correctness.

Fixes #5138. Any stragglers or updates will reference this ticket.

File:

• trunk/tests/phpunit/testcases/members/functions.php (modified) (5 diffs)

trunk/tests/phpunit/testcases/members/functions.php

@@ -172 +172 @@
      */
     public function test_bp_core_get_user_displayname_xprofile_does_not_exist() {
+        $bp = buddypress();
         $xprofile_is_active = bp_is_active( 'xprofile' );
-        buddypress()->active_components['xprofile'] = '1';
+        $bp->active_components['xprofile'] = '1';
 
         $u = $this->factory->user->create( array(
@@ -181 +182 @@
         // Delete directly because BP won't let you delete a required
         // field through the API
-        global $wpdb, $bp;
+        global $wpdb;
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE user_id = %d AND field_id = 1", $u ) );
         wp_cache_delete( 'bp_user_fullname_' . $u, 'bp' );
@@ -191 +192 @@
 
         if ( ! $xprofile_is_active ) {
-            unset( buddypress()->active_components['xprofile'] );
+            unset( $bp->active_components['xprofile'] );
         }
     }
@@ -233 +234 @@
         // Delete directly because BP won't let you delete a required
         // field through the API
-        global $wpdb, $bp;
+        global $wpdb;
+        $bp = buddypress();
         $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE user_id = %d AND field_id = 1", $u2 ) );
         wp_cache_delete( 'bp_user_fullname_' . $u2, 'bp' );
@@ -378 +380 @@
 
         // Create an existing entry in last_activity to test no dupes
-        global $wpdb, $bp;
+        global $wpdb;
+        $bp = buddypress();
         $wpdb->query( $wpdb->prepare(
             "INSERT INTO {$bp->members->table_name_last_activity}