Fix test failures

Author: jkmassel

tests/wp-includes/rest-api/auth/class-test-wp-rest-token.php

@@ -233,15 +233,9 @@ public function test_require_token() {
 
 		// Some GET requests require authentication to work correctly (i.e. – fetching draft posts)
 		// If a token is present, treat it as though it's required.
-		$mock = $this->getMockBuilder( get_class( $this->token ) )
-			->setMethods(
-				array(
-					'validate_token',
-				)
-			)
-			->getMock();
-		$mock->method( 'validate_token' )->willReturn( true );
-		$this->assertTrue( $mock->require_token() );
+		$_SERVER['HTTP_AUTHORIZATION'] = 'Bearer: Test';
+		$this->assertTrue( $this->token->require_token() );
+		unset( $_SERVER['HTTP_AUTHORIZATION'] );
 
 		// Don't require authentication to generate a token.
 		$_SERVER['REQUEST_METHOD'] = 'POST';

wp-includes/rest-api/auth/class-wp-rest-token.php

@@ -275,8 +275,8 @@ public function require_token() {
 		// GET requests do not require authentication, but if
 		// the Authorization header is provided, requests should
 		// be performed as the user corresponding to that token.
-		if ( 'GET' === $request_method && ! is_wp_error( $this->get_auth_header() ) ) {
-			$require_token = true;
+		if ( 'GET' === $request_method && is_wp_error( $this->get_auth_header() ) ) {
+			$require_token = false;
 		}
 
 		// Don't require authentication to generate a token.