Changeset 5883

Timestamp:

07/28/2015 10:27:08 AM (11 years ago)

Author:

netweb

Message:

Installation: When creating initial content, use different times for forum, topic, and reply post times.

This changeset builds on r5843 to allow improved tests in test_bbp_create_initial_content() of forum and topic last active times.

Location:

trunk

Files:

• src/includes/core/update.php (modified) (4 diffs)
• tests/phpunit/testcases/core/update.php (modified) (3 diffs)

trunk/src/includes/core/update.php

@@ -193 +193 @@
 
         // Use the same time for each post
-        $current_time = current_time( 'mysql' );
+        $current_time = time();
+        $forum_time = date( 'Y-m-d H:i:s', $current_time - 60 * 60 * 80 );
+        $topic_time = date( 'Y-m-d H:i:s', $current_time - 60 * 60 * 60 );
+        $reply_time = date( 'Y-m-d H:i:s', $current_time - 60 * 60 * 40 );
 
         // Create the initial forum
@@ -201 +204 @@
                 'post_title'   => $r['forum_title'],
                 'post_content' => $r['forum_content'],
-                'post_date'    => $current_time
+                'post_date'    => $forum_time
         ) );
 
@@ -210 +213 @@
                         'post_title'   => $r['topic_title'],
                         'post_content' => $r['topic_content'],
-                        'post_date'    => $current_time
+                        'post_date'    => $topic_time
                 ),
                 array(
@@ -222 +225 @@
                         'post_parent'  => $topic_id,
                         'post_content' => $r['reply_content'],
-                        'post_date'    => $current_time
+                        'post_date'    => $reply_time
                 ),
                 array(

trunk/tests/phpunit/testcases/core/update.php

@@ -88 +88 @@
                 $topic_id = bbp_get_forum_last_topic_id( $forum_id );
                 $reply_id = bbp_get_forum_last_reply_id( $forum_id );
-                $now = 'right now';
 
                 // Forum post
@@ -130 +129 @@
                 $this->assertSame( 'Reply To: Hello World!', bbp_get_forum_last_reply_title( $forum_id ) );
                 $this->assertSame( $reply_id, bbp_get_forum_last_active_id( $forum_id ) );
-                $this->assertSame( $now, bbp_get_forum_last_active_time( $forum_id ) );
+                $this->assertSame( '1 day, 16 hours ago', bbp_get_forum_last_active_time( $forum_id ) );
 
                 // Topic meta
@@ -140 +139 @@
                 $this->assertSame( $reply_id, bbp_get_topic_last_reply_id( $topic_id ) );
                 $this->assertSame( $reply_id, bbp_get_topic_last_active_id( $topic_id ) );
-                $this->assertSame( $now, bbp_get_topic_last_active_time( $topic_id ) );
+                $this->assertSame( '1 day, 16 hours ago', bbp_get_topic_last_active_time( $topic_id ) );
 
                 // Reply Meta