Commit e0405565 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.1.x' into 2.2.x

Closes gh-19567
parents 82dc7bcc 3fb1bb74
...@@ -54,6 +54,7 @@ import org.springframework.http.HttpStatus; ...@@ -54,6 +54,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.test.web.reactive.server.EntityExchangeResult; import org.springframework.test.web.reactive.server.EntityExchangeResult;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.reactive.function.client.ExchangeStrategies;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
...@@ -164,7 +165,10 @@ class WebMvcEndpointExposureIntegrationTests { ...@@ -164,7 +165,10 @@ class WebMvcEndpointExposureIntegrationTests {
private WebTestClient createClient(AssertableWebApplicationContext context) { private WebTestClient createClient(AssertableWebApplicationContext context) {
int port = context.getSourceApplicationContext(ServletWebServerApplicationContext.class).getWebServer() int port = context.getSourceApplicationContext(ServletWebServerApplicationContext.class).getWebServer()
.getPort(); .getPort();
return WebTestClient.bindToServer().baseUrl("http://localhost:" + port).build(); ExchangeStrategies exchangeStrategies = ExchangeStrategies.builder()
.codecs((configurer) -> configurer.defaultCodecs().maxInMemorySize(512 * 1024)).build();
return WebTestClient.bindToServer().baseUrl("http://localhost:" + port).exchangeStrategies(exchangeStrategies)
.build();
} }
private boolean isExposed(WebTestClient client, HttpMethod method, String path) throws Exception { private boolean isExposed(WebTestClient client, HttpMethod method, String path) throws Exception {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment