Skip to content

Commit 8038be2

Browse files
roksuibclozel
authored andcommitted
Change WebGraphQlServiceTester to WebGraphQlTester
Closes gh-759
1 parent b200ec9 commit 8038be2

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

spring-graphql-docs/modules/ROOT/pages/testing.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ following extensions:
5555
To create a `GraphQlTester` that performs tests on the server side, without a client:
5656

5757
- xref:testing.adoc#testing.graphqlservicetester[ExecutionGraphQlServiceTester]
58-
- xref:testing.adoc#testing.webgraphqltester[WebGraphQlServiceTester]
58+
- xref:testing.adoc#testing.webgraphqltester[WebGraphQlTester]
5959

6060
Each defines a `Builder` with options relevant to the transport. All builders extend
6161
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:
269269
.build();
270270
----
271271

272+
<<<<<<< HEAD:spring-graphql-docs/modules/ROOT/pages/testing.adoc
272273
Once `WebGraphQlServiceTester` is created, you can begin to
273274
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
274279
transport.
275280
276281

0 commit comments

Comments
 (0)