Changeset 34161 for trunk/tests/phpunit/tests/comment/wpCountComments.php

Timestamp:

09/15/2015 01:46:51 AM (11 years ago)

Author:

wonderboymusic

Message:

In _wp_ajax_delete_comment_response(), read the new 'all' prop returned by get_comment_count() via wp_count_comments() when setting $total. 'all' doesn't include spam in its count.

Updates unit tests.

Props dipesh.kakadiya.
Fixes #32362.

File:

• trunk/tests/phpunit/tests/comment/wpCountComments.php (modified) (14 diffs)

trunk/tests/phpunit/tests/comment/wpCountComments.php

@@ -12 +12 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 0, $count->total_comments );
+                $this->assertEquals( 0, $count->all );
         }
 
@@ -27 +28 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 1, $count->total_comments );
+                $this->assertEquals( 1, $count->all );
         }
 
@@ -42 +44 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 1, $count->total_comments );
+                $this->assertEquals( 1, $count->all );
         }
 
@@ -57 +60 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 1, $count->total_comments );
+                $this->assertEquals( 0, $count->all );
         }
 
@@ -72 +76 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 0, $count->total_comments );
+                $this->assertEquals( 0, $count->all );
         }
 
@@ -87 +92 @@
                 $this->assertEquals( 1, $count->{'post-trashed'} );
                 $this->assertEquals( 0, $count->total_comments );
+                $this->assertEquals( 0, $count->all );
         }
 
@@ -106 +112 @@
                 $this->assertEquals( 0, $count1->{'post-trashed'} );
                 $this->assertEquals( 1, $count1->total_comments );
+                $this->assertEquals( 1, $count1->all );
 
                 $all_count1 = wp_count_comments();
@@ -115 +122 @@
                 $this->assertEquals( 0, $all_count1->{'post-trashed'} );
                 $this->assertEquals( 1, $all_count1->total_comments );
+                $this->assertEquals( 1, $all_count1->all );
 
                 wp_spam_comment( $comment_id );
@@ -126 +134 @@
                 $this->assertEquals( 0, $count2->{'post-trashed'} );
                 $this->assertEquals( 1, $count2->total_comments );
+                $this->assertEquals( 0, $count2->all );
 
                 $all_count2 = wp_count_comments();
@@ -135 +144 @@
                 $this->assertEquals( 0, $all_count2->{'post-trashed'} );
                 $this->assertEquals( 1, $all_count2->total_comments );
+                $this->assertEquals( 0, $all_count2->all );
 
                 wp_trash_comment( $comment_id );
@@ -146 +156 @@
                 $this->assertEquals( 0, $count3->{'post-trashed'} );
                 $this->assertEquals( 0, $count3->total_comments );
+                $this->assertEquals( 0, $count3->all );
 
                 $all_count3 = wp_count_comments();
@@ -155 +166 @@
                 $this->assertEquals( 0, $all_count3->{'post-trashed'} );
                 $this->assertEquals( 0, $all_count3->total_comments );
+                $this->assertEquals( 0, $all_count3->all );
 
                 wp_untrash_comment( $comment_id );
@@ -166 +178 @@
                 $this->assertEquals( 0, $count4->{'post-trashed'} );
                 $this->assertEquals( 1, $count4->total_comments );
+                $this->assertEquals( 0, $count4->all );
 
                 $all_count4 = wp_count_comments();
@@ -175 +188 @@
                 $this->assertEquals( 0, $all_count4->{'post-trashed'} );
                 $this->assertEquals( 1, $all_count4->total_comments );
+                $this->assertEquals( 0, $all_count4->all );
         }
 }