Changeset 36531 for trunk/tests/phpunit/tests/rest-api/rest-server.php

Timestamp:

02/16/2016 01:50:06 AM (9 years ago)

Author:

rmccue

Message:

REST API: Fix tests from r36529.

See #35329.

File:

• trunk/tests/phpunit/tests/rest-api/rest-server.php (modified) (1 diff)

trunk/tests/phpunit/tests/rest-api/rest-server.php

@@ -14 +14 @@
         parent::setUp();
 
-        /** @var WP_REST_Server $wp_rest_server */
-        global $wp_rest_server;
-
-        unset( $wp_rest_server );
+        // Reset REST server to ensure only our routes are registered
+        $GLOBALS['wp_rest_server'] = null;
         add_filter( 'wp_rest_server_class', array( $this, 'filter_wp_rest_server_class' ) );
         $this->server = rest_get_server();
         remove_filter( 'wp_rest_server_class', array( $this, 'filter_wp_rest_server_class' ) );
+    }
+
+    public function tearDown() {
+        // Remove our temporary spy server
+        $GLOBALS['wp_rest_server'] = null;
+
+        parent::tearDown();
     }