File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed
spring-graphql-docs/modules/ROOT/pages Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ following extensions:
55
55
To create a `GraphQlTester` that performs tests on the server side, without a client:
56
56
57
57
- xref:testing.adoc#testing.graphqlservicetester[ExecutionGraphQlServiceTester]
58
- - xref:testing.adoc#testing.webgraphqltester[WebGraphQlServiceTester ]
58
+ - xref:testing.adoc#testing.webgraphqltester[WebGraphQlTester ]
59
59
60
60
Each defines a `Builder` with options relevant to the transport. All builders extend
61
61
from a common, base GraphQlTester xref:testing.adoc#testing.graphqltester.builder[`Builder`] with
@@ -269,8 +269,13 @@ The builder for this extension allows you to define HTTP request details:
269
269
.build();
270
270
----
271
271
272
+ <<<<<<< HEAD:spring-graphql-docs/modules/ROOT/pages/testing.adoc
272
273
Once `WebGraphQlServiceTester` is created, you can begin to
273
274
xref:testing.adoc#testing.requests[execute requests] using the same API, independent of the underlying
275
+ =======
276
+ Once `WebGraphQlTester` is created, you can begin to
277
+ <<testing.requests, execute requests>> using the same API, independent of the underlying
278
+ >>>>>>> 37f3f4a9 (Change WebGraphQlServiceTester to WebGraphQlTester):spring-graphql-docs/src/docs/asciidoc/includes/testing.adoc
274
279
transport.
275
280
276
281
You can’t perform that action at this time.
0 commit comments