webflux testing

Author: andimarek

graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/components/GraphQLController.java

@@ -15,7 +15,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.context.request.WebRequest;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
@@ -55,9 +54,8 @@ public Object graphqlGET(
             @RequestParam("query") String query,
             @RequestParam(value = "operationName", required = false) String operationName,
             @RequestParam(value = "variables", required = false) String variablesJson,
-            WebRequest webRequest,
             ServerHttpResponse serverHttpResponse) {
-        Mono<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, operationName, convertVariablesJson(variablesJson)), webRequest);
+        Mono<ExecutionResult> executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, operationName, convertVariablesJson(variablesJson)), null);
         return executionResultHandler.handleExecutionResult(executionResult, serverHttpResponse);
     }
 

graphql-java-spring-webflux/src/test/java/graphql/spring/web/reactive/components/GraphQLControllerTest.java

@@ -12,6 +12,7 @@
 import org.springframework.test.web.reactive.server.WebTestClient;
 import reactor.core.publisher.Mono;
 
+import java.net.URLEncoder;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -34,7 +35,7 @@ public void setup() {
 
 
     @Test
-    public void testVariableJson() throws Exception {
+    public void testPostRequest() throws Exception {
         Map<String, Object> request = new LinkedHashMap<>();
         client.post().uri("/graphql")
                 .body(Mono.just(request), Map.class)
@@ -53,4 +54,20 @@ public void testVariableJson() throws Exception {
 
     }
 
+    @Test
+    public void testGetRequestWithVariables() throws Exception {
+        String variablesJson = "{\"key\":\"value\"}";
+        String variablesValue = URLEncoder.encode(variablesJson, "UTF-8");
+        String queryString = URLEncoder.encode("{foo}", "UTF-8");
+        client.get().uri(uriBuilder -> uriBuilder.path("/graphql")
+                .queryParam("variables", variablesValue)
+                .queryParam("query", queryString)
+                .build(variablesJson, queryString))
+                .accept(MediaType.APPLICATION_JSON_UTF8)
+                .exchange()
+                .expectStatus().isOk()
+                .expectBody()
+                .jsonPath("data", is("foo"));
+
+    }
 }