Changeset 13343 for trunk/tests/phpunit/testcases/activity/functions.php

Timestamp:

10/23/2022 02:21:19 AM (4 years ago)

Author:

imath

Message:

Make sure an activity is created when adding a site from network admin

When the Blogs component is active, creating a new public site from
front-end and now from the WordPress network administration is generating
a new_blog activity type.

Closes ​https://github.com/buddypress/buddypress/pull/28
Fixes #8756

File:

• trunk/tests/phpunit/testcases/activity/functions.php (modified) (7 diffs)

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

@@ -856 +856 @@
                 }
 
-                $b = self::factory()->blog->create();
-                $u = self::factory()->user->create();
+                $bp    = buddypress();
+                $b     = self::factory()->blog->create();
+                $u     = self::factory()->user->create();
+                $reset = $bp->activity->track;
 
                 switch_to_blog( $b );
+
+                $bp->activity->track = array();
 
                 register_post_type( 'foo', array(
@@ -884 +888 @@
 
                 _unregister_post_type( 'foo' );
-                bp_activity_get_actions();
-
                 restore_current_blog();
 
-                $a = self::factory()->activity->create( $activity_args );
-
+                $a     = self::factory()->activity->create( $activity_args );
                 $a_obj = new BP_Activity_Activity( $a );
 
@@ -899 +900 @@
 
                 $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>' );
+                $bp->activity->track = $reset;
 
                 $this->assertSame( $expected, $a_obj->action );
@@ -968 +970 @@
                 }
 
-                $b = self::factory()->blog->create();
-                $u = self::factory()->user->create();
+                $bp = buddypress();
+                $b  = self::factory()->blog->create();
+                $u  = self::factory()->user->create();
+                $reset = $bp->activity->track;
 
                 switch_to_blog( $b );
+
+                $bp->activity->track = array();
 
                 $labels = array(
@@ -1010 +1016 @@
 
                 $user_link = bp_core_get_userlink( $u );
-                $blog_url = get_blog_option( $a_obj->item_id, 'home' );
-                $post_url = add_query_arg( 'p', $p, trailingslashit( $blog_url ) );
+                $blog_url  = get_blog_option( $a_obj->item_id, 'home' );
+                $post_url  = add_query_arg( 'p', $p, trailingslashit( $blog_url ) );
 
                 $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>' );
+                $bp->activity->track = $reset;
 
                 $this->assertSame( $expected, $a_obj->action );
@@ -1098 +1105 @@
          */
         public function test_bp_activity_format_activity_action_custom_post_type_comment() {
+                $bp    = buddypress();
+                $reset = $bp->activity->track;
+
                 if ( is_multisite() ) {
                         $b = self::factory()->blog->create();
+
                         switch_to_blog( $b );
+
+                        $bp->activity->track = array();
                         add_filter( 'comment_flood_filter', '__return_false' );
                 } else {
@@ -1160 +1173 @@
 
                         $expected = sprintf( $labels['bp_activity_new_comment_ms'], $user_link, $comment_url, '<a href="' . $blog_url . '">' . get_blog_option( $a_obj->item_id, 'blogname' ) . '</a>' );
+
+                        $bp->activity->track = $reset;
                 } else {
                         $expected = sprintf( $labels['bp_activity_new_comment'], $user_link, $comment_url );