Ticket #6128: 6128.setUp.patch

tests/phpunit/includes/testcase.php

@@ -40 +40 @@
 
                 // Fixes warnings in multisite functions
                 $_SERVER['REMOTE_ADDR'] = '';
+
+                // Make sure Activity actions are reset before each test
+                $this->reset_bp_activity_actions();
+
+                // Make sure all Post types activities globals are reset before each test
+                $this->reset_bp_activity_post_types_globals();
         }
 
         function clean_up_global_scope() {
@@ -74 +80 @@
                 }
         }
 
+        protected function reset_bp_activity_actions() {
+                buddypress()->activity->actions = new stdClass();
+
+                /**
+                 * Populate the global with default activity actions only
+                 * before each test.
+                 */
+                do_action( 'bp_register_activity_actions' );
+        }
+
+        protected function reset_bp_activity_post_types_globals() {
+                global $wp_post_types;
+
+                // Remove all remaining tracking arguments to each post type
+                foreach ( $wp_post_types as $post_type => $post_type_arg ) {
+                        if ( post_type_supports( $post_type, 'buddypress-activity' ) ) {
+                                remove_post_type_support( 'page', 'buddypress-activity' );
+                        }
+
+                        if ( isset( $post_type_arg->bp_activity ) ) {
+                                unset( $post_type_arg->bp_activity );
+                        }
+                }
+
+                buddypress()->activity->track = array();
+        }
+
         function assertPreConditions() {
                 parent::assertPreConditions();
 

tests/phpunit/testcases/activity/actions.php

@@ -22 +22 @@
          * @group activity_tracking
          */
         public function test_bp_activity_catch_transition_post_type_status_publish() {
-                $bp = buddypress();
-
                 register_post_type( 'foo', array(
                         'label'   => 'foo',
                         'public'   => true,
@@ -41 +39 @@
                 $this->assertTrue( $this->activity_exists_for_post( $post_id, 'new_foo' ), 'Published post type should have activity' );
 
                 _unregister_post_type( 'foo' );
-
-                // Reset globals
-                unset( $bp->activity->actions->activity->new_foo );
-                $bp->activity->track = array();
         }
 
         /**
@@ -52 +46 @@
          * @group activity_tracking
          */
         public function test_bp_activity_catch_transition_post_type_status_publish_to_publish() {
-                $bp = buddypress();
-
                 register_post_type( 'foo', array(
                         'label'   => 'foo',
                         'public'   => true,
@@ -81 +73 @@
                 $this->assertFalse( $this->activity_exists_for_post( $post_id, 'new_foo' ), 'Updating a post type should not create a new activity' );
 
                 _unregister_post_type( 'foo' );
-
-                // Reset globals
-                unset( $bp->activity->actions->activity->new_foo );
-                $bp->activity->track = array();
         }
 
         /**
@@ -92 +80 @@
          * @group activity_tracking
          */
         public function test_bp_activity_catch_transition_post_type_status_publish_password() {
-                $bp = buddypress();
-
                 register_post_type( 'foo', array(
                         'label'   => 'foo',
                         'public'   => true,
@@ -119 +105 @@
                 $this->assertFalse( $this->activity_exists_for_post( $post_id, 'new_foo' ), 'Password protected post type should not have activity' );
 
                 _unregister_post_type( 'foo' );
-
-                // Reset globals
-                unset( $bp->activity->actions->activity->new_foo );
-                $bp->activity->track = array();
         }
 
         /**
@@ -130 +112 @@
          * @group activity_tracking
          */
         public function test_bp_activity_catch_transition_post_type_status_publish_trash() {
-                $bp = buddypress();
-
                 register_post_type( 'foo', array(
                         'label'   => 'foo',
                         'public'   => true,
@@ -154 +134 @@
                 $this->assertFalse( $this->activity_exists_for_post( $post_id, 'new_foo' ), 'Unpublished post type should not have activity' );
 
                 _unregister_post_type( 'foo' );
-
-                // Reset globals
-                unset( $bp->activity->actions->activity->new_foo );
-                $bp->activity->track = array();
         }
 
         protected function activity_exists_for_post( $post_id, $action ) {

tests/phpunit/testcases/activity/functions.php

@@ -585 +585 @@
                         return;
                 }
 
-                $bp = buddypress();
-
                 register_post_type( 'foo', array(
                         'label'   => 'foo',
                         'public'   => true,
                         'supports' => array( 'buddypress-activity' ),
                 ) );
 
-                // Build the actions to fetch the tracking args
-                bp_activity_get_actions();
-
                 $u = $this->factory->user->create();
                 $p = $this->factory->post->create( array(
                         'post_author' => $u,
@@ -622 +617 @@
                 $this->assertSame( $expected, $a_obj->action );
 
                 _unregister_post_type( 'foo' );
-
-                // Reset globals
-                unset( $bp->activity->actions->activity->new_foo );
-                $bp->activity->track = array();
         }
 
         /**
@@ -638 +629 @@
                         return;
                 }
 
-                $bp = buddypress();
-
                 $b = $this->factory->blog->create();
                 $u = $this->factory->user->create();
 
@@ -668 +657 @@
                 );
 
                 _unregister_post_type( 'foo' );
-                bp_activity_get_actions();
 
                 restore_current_blog();
 
@@ -685 +673 @@
                 $expected = sprintf( '%s wrote a new %s, on the site %s', $user_link, $post_link, '<a href="' . $blog_url . '">' . get_blog_option( $a_obj->item_id, 'blogname' ) . '</a>' );
 
                 $this->assertSame( $expected, $a_obj->action );
-
-                // Reset globals
-                unset( $bp->activity->actions->activity->new_foo );
-                $bp->activity->track = array();
         }
 
         /**
@@ -696 +680 @@
          * @group bp_activity_get_actions
          */
         public function test_bp_activity_get_actions_should_sort_by_position() {
-                $old_actions = bp_activity_get_actions();
-                buddypress()->activity->actions = new stdClass;
 
                 register_post_type( 'foo5', array(
                         'public'      => true,
@@ -738 +720 @@
                 );
                 $foo_actions = (array) $actions->foo;
                 $this->assertEquals( $expected, array_values( wp_list_pluck( $foo_actions, 'key' ) ) );
-
-                buddypress()->activity->actions = $old_actions;
         }
 
         /**
@@ -751 +731 @@
                         return;
                 }
 
-                $bp = buddypress();
-
                 $labels = array(
                         'name'                 => 'bars',
                         'singular_name'        => 'bar',
@@ -768 +746 @@
                         ),
                 ) );
 
-                // Build the actions to fetch the tracking args
-                bp_activity_get_actions();
-
                 $u = $this->factory->user->create();
                 $p = $this->factory->post->create( array(
                         'post_author' => $u,
@@ -796 +771 @@
                 $this->assertSame( $expected, $a_obj->action );
 
                 _unregister_post_type( 'foo' );
-
-                // Reset globals
-                unset( $bp->activity->actions->activity->foo_bar );
-                $bp->activity->track = array();
         }
 
         /**
@@ -812 +783 @@
                         return;
                 }
 
-                $bp = buddypress();
-                $reset = $bp->activity->actions;
-
                 $b = $this->factory->blog->create();
                 $u = $this->factory->user->create();
 
@@ -863 +831 @@
                 $expected = sprintf( '%1$s shared a new <a href="%2$s">bar</a>, on the site %3$s', $user_link, $post_url, '<a href="' . $blog_url . '">' . get_blog_option( $a_obj->item_id, 'blogname' ) . '</a>' );
 
                 $this->assertSame( $expected, $a_obj->action );
-
-                // Reset globals
-                unset( $bp->activity->actions->activity->new_foo );
-                $bp->activity->track = array();
         }
 
         /**
@@ -883 +847 @@
                         'dummy'        => 'dummy value',
                 ) );
 
-                // Build the actions to fetch the tracking args
-                bp_activity_get_actions();
-
                 $u = $this->factory->user->create();
 
                 $post_id = $this->factory->post->create( array(
@@ -903 +864 @@
                 $this->assertSame( $bp->blogs->id, $a['activities'][0]->component );
 
                 remove_post_type_support( 'page', 'buddypress-activity' );
-
-                // Reset globals
-                unset( $bp->activity->actions->blogs->new_page );
-                $bp->activity->track = array();
         }
 
         /**

tests/phpunit/testcases/blogs/activity.php

@@ -6 +6 @@
          * @group activity_tracking
          */
         public function test_bp_blogs_loader_post_tracking_args_filter() {
-                $bp = buddypress();
 
                 $expected = array( 'new_blog_post', 'new_blog_comment' );
 
@@ -233 +232 @@
                         return;
                 }
 
+                // Make sure the filter will be fired
+                bp_activity_get_actions();
+
                 add_filter( 'bp_blogs_activity_new_post_action', array( $this, 'new_post_passthrough' ), 10, 2 );
 
                 $b = $this->factory->blog->create();