Changeset 50954 for trunk/tests/phpunit/tests/xmlrpc/basic.php

Timestamp:

05/24/2021 02:17:36 AM (5 years ago)

Author:

peterwilsoncc

Message:

XML-RPC: Set HTTP status code in accordance with the spec.

When the XML-RPC endpoint is enabled, always return a HTTP 200 OK status code in accordance with the XML-RPC specification. Continue to return an HTTP 405 Method Not Allowed status code when the endpoint is disabled.

Props ariskataoka, johnbillion.
Fixes #52958.

File:

• trunk/tests/phpunit/tests/xmlrpc/basic.php (modified) (3 diffs)

trunk/tests/phpunit/tests/xmlrpc/basic.php

@@ -17 +17 @@
         }
 
-        function test_disabled() {
-                add_filter( 'xmlrpc_enabled', '__return_false' );
-
-                $result = $this->myxmlrpcserver->wp_getOptions( array( 1, 'username', 'password' ) );
-
-                $this->assertIXRError( $result );
-                $this->assertSame( 405, $result->code );
-        }
-
         function test_login_pass_ok() {
-                $user_id = $this->make_user_by_role( 'subscriber' );
+                $this->make_user_by_role( 'subscriber' );
 
                 $this->assertTrue( $this->myxmlrpcserver->login_pass_ok( 'subscriber', 'subscriber' ) );
@@ -34 +25 @@
 
         function test_login_pass_bad() {
-                $user_id = $this->make_user_by_role( 'subscriber' );
+                $this->make_user_by_role( 'subscriber' );
 
                 $this->assertFalse( $this->myxmlrpcserver->login_pass_ok( 'username', 'password' ) );
@@ -118 +109 @@
                 $this->assertXmlStringEqualsXmlString( $return, $value->getXML() );
         }
+
+        function test_disabled() {
+                add_filter( 'xmlrpc_enabled', '__return_false' );
+                $testcase_xmlrpc_server = new wp_xmlrpc_server();
+                $result                 = $testcase_xmlrpc_server->wp_getOptions( array( 1, 'username', 'password' ) );
+
+                $this->assertIXRError( $result );
+                $this->assertSame( 405, $result->code );
+        }
 }