Merge branch '2.7.x' into 3.0.x

Author: philwebb

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/graphql/GraphQlTestIntegrationTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.test.autoconfigure.graphql;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,6 @@
  * @author Brian Clozel
  */
 @GraphQlTest(BookController.class)
-@Disabled
 class GraphQlTestIntegrationTests {
 
 	@Autowired

spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/graphql/schema.graphqls

@@ -0,0 +1,10 @@
+type Query {
+    bookById(id: ID): Book
+}
+
+type Book {
+    id: ID
+    name: String
+    pageCount: Int
+    author: String
+}