Merge branch '1.2.x'

spring-projects · May 20, 2024 · abcc384 · abcc384
2 parents f9a34ef + 91b6beb
commit abcc384
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...rc/test/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandlerTests.java b/...rc/test/java/org/springframework/graphql/server/webflux/GraphQlWebSocketHandlerTests.java
@@ -311,8 +311,8 @@ void subscriptionExists() {
 				.verify(TIMEOUT);
 
 		assertThat(messages.size()).isEqualTo(2);
+		assertThat(messages.size()).isGreaterThanOrEqualTo(1).isLessThan(3);
 		assertThat(messages.get(0).resolvedType()).isEqualTo(CONNECTION_ACK);
-		assertThat(messages.get(1).resolvedType()).isEqualTo(GraphQlWebSocketMessageType.NEXT);
 	}
 
 	@Test

diff --git a/...src/test/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandlerTests.java b/...src/test/java/org/springframework/graphql/server/webmvc/GraphQlWebSocketHandlerTests.java
@@ -314,9 +314,8 @@ void subscriptionExists() throws Exception {
 				.expectComplete()
 				.verify(TIMEOUT);
 
-		assertThat(messages.size()).isEqualTo(2);
-		assertThat(messages.get(0).resolvedType()).isEqualTo(GraphQlWebSocketMessageType.CONNECTION_ACK);
-		assertThat(messages.get(1).resolvedType()).isEqualTo(GraphQlWebSocketMessageType.NEXT);
+		assertThat(messages.size()).isGreaterThanOrEqualTo(1).isLessThan(3);
+		assertThat(messages.get(0).resolvedType()).isEqualTo(CONNECTION_ACK);
 	}
 
 	@Test