root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x 

Closes gh-39619
This commit is contained in:
Moritz Halbritter 2024-02-19 11:09:36 +01:00
parent 59693f2b12 d2136e5017
commit bb7706fe88
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketWebSocketNettyRouteProviderTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -74,7 +74,14 @@ class RSocketWebSocketNettyRouteProviderTests {
.block(Duration.ofSeconds(3)); .block(Duration.ofSeconds(3));
assertThat(rsocketResponse.getName()).isEqualTo("rsocket"); assertThat(rsocketResponse.getName()).isEqualTo("rsocket");
WebTestClient client = createWebTestClient(serverContext.getWebServer()); WebTestClient client = createWebTestClient(serverContext.getWebServer());
client.get().uri("/protocol").exchange().expectStatus().isOk().expectBody().jsonPath("name", "http"); client.get()
.uri("/protocol")
.exchange()
.expectStatus()
.isOk()
.expectBody()
.jsonPath("name")
.isEqualTo("http");
}); });
} }