diff --git tests/phpunit/includes/testcase.php tests/phpunit/includes/testcase.php
index 4734179..1355ebe 100644
--- tests/phpunit/includes/testcase.php
+++ tests/phpunit/includes/testcase.php
@@ -40,6 +40,12 @@ class BP_UnitTestCase extends WP_UnitTestCase {
// 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,6 +80,33 @@ class BP_UnitTestCase extends WP_UnitTestCase {
}
}
+ 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();
diff --git tests/phpunit/testcases/activity/actions.php tests/phpunit/testcases/activity/actions.php
index 799a8fe..bccfcd3 100644
--- tests/phpunit/testcases/activity/actions.php
+++ tests/phpunit/testcases/activity/actions.php
@@ -22,8 +22,6 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
* @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,10 +39,6 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
$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,8 +46,6 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
* @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,10 +73,6 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
$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,8 +80,6 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
* @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,10 +105,6 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
$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,8 +112,6 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
* @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,10 +134,6 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
$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 ) {
diff --git tests/phpunit/testcases/activity/functions.php tests/phpunit/testcases/activity/functions.php
index 4f8cad6..b6425d9 100644
--- tests/phpunit/testcases/activity/functions.php
+++ tests/phpunit/testcases/activity/functions.php
@@ -585,17 +585,12 @@ Bar!';
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,10 +617,6 @@ Bar!';
$this->assertSame( $expected, $a_obj->action );
_unregister_post_type( 'foo' );
-
- // Reset globals
- unset( $bp->activity->actions->activity->new_foo );
- $bp->activity->track = array();
}
/**
@@ -638,8 +629,6 @@ Bar!';
return;
}
- $bp = buddypress();
-
$b = $this->factory->blog->create();
$u = $this->factory->user->create();
@@ -668,7 +657,6 @@ Bar!';
);
_unregister_post_type( 'foo' );
- bp_activity_get_actions();
restore_current_blog();
@@ -685,10 +673,6 @@ Bar!';
$expected = sprintf( '%s wrote a new %s, on the site %s', $user_link, $post_link, '' . get_blog_option( $a_obj->item_id, 'blogname' ) . '' );
$this->assertSame( $expected, $a_obj->action );
-
- // Reset globals
- unset( $bp->activity->actions->activity->new_foo );
- $bp->activity->track = array();
}
/**
@@ -696,8 +680,6 @@ Bar!';
* @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,8 +720,6 @@ Bar!';
);
$foo_actions = (array) $actions->foo;
$this->assertEquals( $expected, array_values( wp_list_pluck( $foo_actions, 'key' ) ) );
-
- buddypress()->activity->actions = $old_actions;
}
/**
@@ -751,8 +731,6 @@ Bar!';
return;
}
- $bp = buddypress();
-
$labels = array(
'name' => 'bars',
'singular_name' => 'bar',
@@ -768,9 +746,6 @@ Bar!';
),
) );
- // 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,10 +771,6 @@ Bar!';
$this->assertSame( $expected, $a_obj->action );
_unregister_post_type( 'foo' );
-
- // Reset globals
- unset( $bp->activity->actions->activity->foo_bar );
- $bp->activity->track = array();
}
/**
@@ -812,9 +783,6 @@ Bar!';
return;
}
- $bp = buddypress();
- $reset = $bp->activity->actions;
-
$b = $this->factory->blog->create();
$u = $this->factory->user->create();
@@ -863,10 +831,6 @@ Bar!';
$expected = sprintf( '%1$s shared a new bar, on the site %3$s', $user_link, $post_url, '' . get_blog_option( $a_obj->item_id, 'blogname' ) . '' );
$this->assertSame( $expected, $a_obj->action );
-
- // Reset globals
- unset( $bp->activity->actions->activity->new_foo );
- $bp->activity->track = array();
}
/**
@@ -883,9 +847,6 @@ Bar!';
'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,10 +864,6 @@ Bar!';
$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();
}
/**
diff --git tests/phpunit/testcases/blogs/activity.php tests/phpunit/testcases/blogs/activity.php
index 96b6ab6..574a937 100644
--- tests/phpunit/testcases/blogs/activity.php
+++ tests/phpunit/testcases/blogs/activity.php
@@ -6,7 +6,6 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
* @group activity_tracking
*/
public function test_bp_blogs_loader_post_tracking_args_filter() {
- $bp = buddypress();
$expected = array( 'new_blog_post', 'new_blog_comment' );
@@ -233,6 +232,9 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
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();