Changeset 11042

Timestamp:

08/30/2016 03:44:33 PM (8 years ago)

Author:

boonebgorges

Message:

Tests: Fix message factory create/get methods.

Previously, message creation was failing because no 'sender_id' or
'recipients' were set. We now create senders and recipients when none
are passed to the create() method.

This changeset also fixes the return value of create_object(), so that
create_and_get() works for messages.

Props jdgrimes.
Fixes #7234.

Location:

trunk/tests/phpunit

Files:

• includes/factory.php (modified) (2 diffs)
• testcases/testsuite (added)
• testcases/testsuite/factory.php (added)

trunk/tests/phpunit/includes/factory.php

@@ -158 +158 @@
             'sender_id'  => get_current_user_id(),
             'thread_id'  => 0,
-            'recipients' => array(),
             'subject'    => new WP_UnitTest_Generator_Sequence( 'Message subject %s' ),
             'content'    => new WP_UnitTest_Generator_Sequence( 'Message content %s' ),
@@ -166 +165 @@
 
     function create_object( $args ) {
-        $message_id = messages_new_message( $args );
-        return $message_id;
-    }
-
-    function update_object( $group_id, $fields ) {
+        if ( empty( $args['sender_id'] ) ) {
+            $args['sender_id'] = $this->factory->user->create();
+        }
+
+        if ( empty( $args['recipients'] ) ) {
+            $recipient = $this->factory->user->create_and_get();
+            $args['recipients'] = array( $recipient->user_nicename );
+        }
+
+        $thread_id = messages_new_message( $args );
+        $thread = new BP_Messages_Thread( $thread_id );
+        return end( $thread->messages )->id;
+    }
+
+    function update_object( $message_id, $fields ) {
         // todo
     }
 
-    function get_object_by_id( $group_id ) {
-        // todo
+    function get_object_by_id( $message_id ) {
+        return new BP_Messages_Message( $message_id );
     }
 }