Changeset 5811

Timestamp:

07/11/2015 05:12:02 AM (10 years ago)

Author:

netweb

Message:

Topics: Fix bbp_get_topic_post_date() default GMT date format copy pasta introduced in r4647, includes unit tests.

Props tobyhawkins. Fixes #2697

Location:

trunk

Files:

• src/includes/topics/template.php (modified) (1 diff)
• tests/phpunit/testcases/replies/template/reply.php (modified) (1 diff)
• tests/phpunit/testcases/topics/template/topic.php (modified) (2 diffs)

trunk/src/includes/topics/template.php ¶

@@ -815 +815 @@
         // 4 days, 4 hours ago
         if ( ! empty( $humanize ) ) {
-            $gmt_s  = ! empty( $gmt ) ? 'U' : 'G';
+            $gmt_s  = ! empty( $gmt ) ? 'G' : 'U';
             $date   = get_post_time( $gmt_s, $gmt, $topic_id );
             $time   = false; // For filter below

trunk/tests/phpunit/testcases/replies/template/reply.php ¶

@@ -107 +107 @@
      * @covers ::bbp_reply_post_date
      * @covers ::bbp_get_reply_post_date
-     * @todo   Implement test_bbp_get_reply_post_date().
      */
     public function test_bbp_get_reply_post_date() {
-        // 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,
+            ),
+        ) );
+
+        $now = time();
+        $post_date = date( 'Y-m-d H:i:s', $now - 60*66 );
+
+        $r = $this->factory->reply->create( array(
+            'post_parent' => $t,
+            'post_date' => $post_date,
+            'reply_meta' => array(
+                'forum_id' => $f,
+                'topic_id' => $t,
+            ),
+        ) );
+
+        // Configue our written date time, August 4, 2012 at 2:37 pm.
+        $gmt = false;
+        $date   = get_post_time( get_option( 'date_format' ), $gmt, $r, true );
+        $time   = get_post_time( get_option( 'time_format' ), $gmt, $r, true );
+        $result = sprintf( '%1$s at %2$s', $date, $time );
+
+        // Output, string, August 4, 2012 at 2:37 pm.
+        $this->expectOutputString( $result );
+        bbp_reply_post_date( $r );
+
+        // String, August 4, 2012 at 2:37 pm.
+        $datetime = bbp_get_topic_post_date( $r, false, false );
+        $this->assertSame( $result, $datetime );
+
+        // Humanized string, 4 days, 4 hours ago.
+        $datetime = bbp_get_topic_post_date( $r, true, false );
+        $this->assertSame( '1 hour, 6 minutes ago', $datetime );
+
+        // Humanized string using GMT formatted date, 4 days, 4 hours ago.
+        $datetime = bbp_get_topic_post_date( $r, true, true );
+        $this->assertSame( '1 hour, 6 minutes ago', $datetime );
     }
 

trunk/tests/phpunit/testcases/topics/template/topic.php ¶

@@ -1 +1 @@
 <?php
-
 /**
  * Tests for the topics component topic template functions.
@@ -107 +106 @@
      * @covers ::bbp_topic_post_date
      * @covers ::bbp_get_topic_post_date
-     * @todo   Implement test_bbp_get_topic_post_date().
      */
     public function test_bbp_get_topic_post_date() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $f = $this->factory->forum->create();
+
+        $now = time();
+        $post_date = date( 'Y-m-d H:i:s', $now - 60*60*100 );
+
+        $t = $this->factory->topic->create( array(
+            'post_parent' => $f,
+            'post_date' => $post_date,
+            'topic_meta' => array(
+                'forum_id' => $f,
+            ),
+        ) );
+
+        // Configue our written date time, August 4, 2012 at 2:37 pm.
+        $gmt = false;
+        $date   = get_post_time( get_option( 'date_format' ), $gmt, $t, true );
+        $time   = get_post_time( get_option( 'time_format' ), $gmt, $t, true );
+        $result = sprintf( '%1$s at %2$s', $date, $time );
+
+        // Output, string, August 4, 2012 at 2:37 pm.
+        $this->expectOutputString( $result );
+        bbp_topic_post_date( $t );
+
+        // String, August 4, 2012 at 2:37 pm.
+        $datetime = bbp_get_topic_post_date( $t, false, false );
+        $this->assertSame( $result, $datetime );
+
+        // Humanized string, 4 days, 4 hours ago.
+        $datetime = bbp_get_topic_post_date( $t, true, false );
+        $this->assertSame( '4 days, 4 hours ago', $datetime );
+
+        // Humanized string using GMT formatted date, 4 days, 4 hours ago.
+        $datetime = bbp_get_topic_post_date( $t, true, true );
+        $this->assertSame( '4 days, 4 hours ago', $datetime );
     }