From 981e27f306db1e5d77934dd02a95e72f7c5f3085 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 9 Aug 2019 12:18:15 -0400 Subject: [PATCH] Removes allow-bean-definition-overriding=true fixes gh-1140 --- .../gateway/rsocket/core/GatewayRSocketIntegrationTests.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spring-cloud-gateway-rsocket/src/test/java/org/springframework/cloud/gateway/rsocket/core/GatewayRSocketIntegrationTests.java b/spring-cloud-gateway-rsocket/src/test/java/org/springframework/cloud/gateway/rsocket/core/GatewayRSocketIntegrationTests.java index 91dffbfd..901bfb58 100644 --- a/spring-cloud-gateway-rsocket/src/test/java/org/springframework/cloud/gateway/rsocket/core/GatewayRSocketIntegrationTests.java +++ b/spring-cloud-gateway-rsocket/src/test/java/org/springframework/cloud/gateway/rsocket/core/GatewayRSocketIntegrationTests.java @@ -37,10 +37,7 @@ import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) -@SpringBootTest(classes = PingPongApp.class, properties = { "ping.take=10", - // TODO: remove after - // https://github.com/spring-cloud/spring-cloud-gateway/issues/1140 - "spring.main.allow-bean-definition-overriding=true" }, +@SpringBootTest(classes = PingPongApp.class, properties = { "ping.take=10" }, webEnvironment = WebEnvironment.RANDOM_PORT) public class GatewayRSocketIntegrationTests {