Changeset 10550

Timestamp:

02/07/2016 06:13:27 PM (5 years ago)

Author:

imath

Message:

Post Type Activities: make sure an activity is generated when the post is edited.

Props r-a-y

Fixes #6834

Location:

trunk

Files:

• src/bp-activity/bp-activity-actions.php (modified) (1 diff)
• tests/phpunit/testcases/activity/actions.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-actions.php

@@ -798 +798 @@
         // An edit of an existing post should update the existing activity item.
         if ( $new_status == 'publish' ) {
-            bp_activity_post_type_update( $post );
+            $edit = bp_activity_post_type_update( $post );
+
+            // Post was never recorded into activity stream, so record it now!
+            if ( null === $edit ) {
+                bp_activity_post_type_publish( $post->ID, $post );
+            }
         }
 

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

@@ -50 +50 @@
         $this->assertTrue( $this->activity_exists_for_post( $post_id, 'new_foo' ), 'Published post type should have activity' );
 
-        // Delete the activity
-        bp_activity_post_type_unpublish( $post_id, $post );
+        _unregister_post_type( 'foo' );
+    }
 
-        $post->post_status = 'publish';
-        $post->post_content .= ' foo';
+    /**
+     * @group bp_activity_catch_transition_post_type_status
+     * @group activity_tracking
+     */
+    public function test_bp_activity_catch_transition_post_type_status_publish_existing_post() {
+        $u = $this->factory->user->create();
 
-        wp_update_post( $post );
+        $labels = array(
+            'bp_activity_admin_filter' => 'New Foo',
+            'bp_activity_front_filter' => 'Foos',
+                'bp_activity_new_post'    => '%1$s posted a new <a href="%2$s">foo</a>',
+                'bp_activity_new_post_ms' => '%1$s posted a new <a href="%2$s">foo</a>, on the site %3$s',
+        );
 
-        $this->assertFalse( $this->activity_exists_for_post( $post_id, 'new_foo' ), 'Updating a post type should not create a new activity' );
+        /**
+         * 'public' must be set to true, otherwise bp_activity_get_post_types_tracking_args() fails.
+         */
+        register_post_type( 'foo', array(
+            'labels'      => $labels,
+            'public'      => true,
+            'supports'    => array( 'buddypress-activity' ),
+            'bp_activity' => array(
+                'action_id'    => 'new_foo',
+                'contexts'     => array( 'activity' ),
+                'position'     => 40,
+            )
+        ) );
 
+        // Temporarily remove post type activity hook so activity item isn't created.
+        remove_action( 'transition_post_status', 'bp_activity_catch_transition_post_type_status', 10, 3 );
+
+        // Create the initial post.
+        $p = $this->factory->post->create( array(
+            'post_author' => $u,
+            'post_type'   => 'foo',
+        ) );
+
+        $this->assertEmpty( bp_activity_get_activity_id( array( 'type' => 'new_foo' ) ) );
+
+        // Add the post type activity hook back.
+        add_action( 'transition_post_status', 'bp_activity_catch_transition_post_type_status', 10, 3 );
+
+        // Emulate updating a post; this should create an activity item.
+        wp_update_post( array(
+            'ID'     => $p,
+            'post_title' => 'This is an edit',
+        ) );
+
+        // Assert!
+        $this->assertNotEmpty( bp_activity_get_activity_id( array( 'type' => 'new_foo' ) ), 'Activity item was not created during an edit of an existing WordPress post.' );
+
+        // Clean up.
         _unregister_post_type( 'foo' );
     }