Changeset 7234 for branches/2.6/tests/phpunit/testcases/topics/functions/topic.php

Timestamp:

02/17/2022 08:04:32 PM (4 years ago)

Author:

johnjamesjacoby

Message:

Moderation: use the correct post_status when untrashing a topic/reply.

This change fixes a bug/regression (since WordPress 5.6.0) that was causing untrashed topics & replies to use an unintended post_status value.

It fixes it by adding a new function ('bbp_fix_untrash_post_status()') and hooking it to the wp_untrash_post_status filter in WordPress, and overriding the results as needed.

Props r-a-y.

In branches/2.6 for 2.6.10. Fixes #3433.

File:

• branches/2.6/tests/phpunit/testcases/topics/functions/topic.php (modified) (1 diff)

branches/2.6/tests/phpunit/testcases/topics/functions/topic.php

@@ -424 +424 @@
     /**
      * @covers ::bbp_untrash_topic
-     * @todo   Implement test_bbp_untrash_topic().
      */
     public function test_bbp_untrash_topic() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $f = $this->factory->forum->create();
+        $t = $this->factory->topic->create( array(
+            'post_parent' => $f,
+            'topic_meta' => array(
+                'forum_id' => $f,
+            ),
+        ) );
+
+        wp_trash_post( $t );
+
+        wp_untrash_post( $t );
+
+        $this->assertTrue( 'publish' === get_post_status( $t ) );
     }
 
     /**
      * @covers ::bbp_untrash_topic_replies
-     * @todo   Implement test_bbp_untrash_topic_replies().
      */
     public function test_bbp_untrash_topic_replies() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $f = $this->factory->forum->create();
+        $t = $this->factory->topic->create( array(
+            'post_parent' => $f,
+            'topic_meta' => array(
+                'forum_id' => $f,
+            ),
+        ) );
+        $r = $this->factory->reply->create_many( 2, array(
+            'post_parent' => $t,
+            'reply_meta' => array(
+                'forum_id' => $f,
+                'topic_id' => $t,
+            ),
+        ) );
+
+        wp_trash_post( $t );
+
+        wp_untrash_post( $t );
+
+        $expected = [];
+        $expected[] = get_post_status( $r[0] );
+        $expected[] = get_post_status( $r[1] );
+
+        $this->assertSame( [ 'publish', 'publish' ], $expected );
     }