Changeset 9951 for trunk/tests/phpunit/testcases/messages/star.php

Timestamp:

06/16/2015 10:59:18 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Messages: Modify message thread queries to exclude messages in deleted threads from "Starred" messages.

This change ensures that deleted messages do not appear in the "Starred" section of a member's private messages. Previously, it was possible to delete a private message thread, and still have it come back to life in the "Starred" messages section.

Fixes #6483. Props r-a-y. (trunk, for 2.4.0)

File:

• trunk/tests/phpunit/testcases/messages/star.php (modified) (1 diff)

trunk/tests/phpunit/testcases/messages/star.php

@@ -108 +108 @@
 
     /**
+     * @group bp_messages_filter_starred_message_threads
+     */
+    public function test_get_starred_threads_should_not_include_deleted_thread() {
+        $old_current_user = get_current_user_id();
+        $u1 = $this->factory->user->create();
+        $u2 = $this->factory->user->create();
+
+        // create three threads
+        $t1 = $this->factory->message->create( array(
+            'sender_id'  => $u1,
+            'recipients' => array( $u2 ),
+            'subject'    => 'A',
+        ) );
+        $t2 = $this->factory->message->create( array(
+            'sender_id'  => $u1,
+            'recipients' => array( $u2 ),
+            'subject'    => 'B',
+        ) );
+        $t3 = $this->factory->message->create( array(
+            'sender_id'  => $u1,
+            'recipients' => array( $u2 ),
+            'subject'    => 'C',
+        ) );
+
+        // grab the message ids as individual variables
+        list( $m1 ) = $this->get_message_ids( $t1 );
+        list( $m2 ) = $this->get_message_ids( $t2 );
+        list( $m3 ) = $this->get_message_ids( $t3 );
+
+        // star all threads
+        bp_messages_star_set_action( array(
+            'user_id'    => $u2,
+            'message_id' => $m1,
+        ) );
+        bp_messages_star_set_action( array(
+            'user_id'    => $u2,
+            'message_id' => $m2,
+        ) );
+        bp_messages_star_set_action( array(
+            'user_id'    => $u2,
+            'message_id' => $m3,
+        ) );
+
+        // delete the second thread
+        $this->set_current_user( $u2 );
+        messages_delete_thread( $t2 );
+
+        // load the starred threads loop
+        global $messages_template;
+        add_filter( 'bp_after_has_message_threads_parse_args', 'bp_messages_filter_starred_message_threads' );
+        bp_has_message_threads();
+        remove_filter( 'bp_after_has_message_threads_parse_args', 'bp_messages_filter_starred_message_threads' );
+
+        // assert that second thread isn't in starred thread loop
+        $thread_ids = wp_list_pluck( $messages_template->threads, 'thread_id' );
+        $this->assertFalse( in_array( $t2, $thread_ids ) );
+
+        // reset
+        $this->set_current_user( $old_current_user );
+    }
+
+    /**
      * Helper method to grab the message IDs from a message thread.
      *