From 3e46dd8b924bbc0e0214667dca4e476a035a4adc Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Thu, 24 Sep 2015 21:47:51 +0000
Subject: [PATCH] Comments: In `get_comment_statuses()`, also return `trash`.
 XML-RPC: In `wp_xmlrpc_server::wp_editComment()`, allow comments to be
 trashed.

Introduce unit tests for `wp_editComment` in `xmlrpc/*` #NeverForget

Props tyxla, wonderboymusic.
Fixes #30965.


git-svn-id: https://develop.svn.wordpress.org/trunk@34524 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/comment-functions.php         |  2 ++
 tests/phpunit/tests/xmlrpc/wp/editComment.php | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 tests/phpunit/tests/xmlrpc/wp/editComment.php

diff --git a/src/wp-includes/comment-functions.php b/src/wp-includes/comment-functions.php
index abe8291613..7b76dbedeb 100644
--- a/src/wp-includes/comment-functions.php
+++ b/src/wp-includes/comment-functions.php
@@ -237,6 +237,8 @@ function get_comment_statuses() {
 		'approve'	=> _x('Approved', 'adjective'),
 		/* translators: comment status */
 		'spam'		=> _x('Spam', 'adjective'),
+		/* translators: comment status */
+		'trash'		=> _x('Trash', 'adjective'),
 	);
 
 	return $status;
diff --git a/tests/phpunit/tests/xmlrpc/wp/editComment.php b/tests/phpunit/tests/xmlrpc/wp/editComment.php
new file mode 100644
index 0000000000..d6ba91fdfc
--- /dev/null
+++ b/tests/phpunit/tests/xmlrpc/wp/editComment.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @group xmlrpc
+ */
+class Tests_XMLRPC_wp_editComment extends WP_XMLRPC_UnitTestCase {
+	function test_trash_comment() {
+		$this->make_user_by_role( 'administrator' );
+		$post_id = $this->factory->post->create();
+
+		$comment_data = array(
+			'comment_post_ID' => $post_id,
+			'comment_author' => 'Test commenter',
+			'comment_author_url' => 'http://example.com/',
+			'comment_author_email' => 'example@example.com',
+			'comment_content' => rand_str( 100 ),
+			'comment_approved' => '1'
+		);
+		$comment_id = wp_insert_comment( $comment_data );
+
+		$this->assertEquals( '1', get_comment( $comment_id )->comment_approved );
+
+		$this->myxmlrpcserver->wp_editComment( array( 1, 'administrator', 'administrator', $comment_id, array(
+			'status' => 'trash'
+		) ) );
+
+		$this->assertEquals( 'trash', get_comment( $comment_id )->comment_approved );
+	}
+}
\ No newline at end of file