mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge pull request #24604 from izeye
* pr/24604: Polish Closes gh-24604
This commit is contained in:
commit
ccdf5a9386
@ -360,7 +360,7 @@ class ProfilesTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void simpleRecursiveReferenceInProfileGroupThrowsException() {
|
void simpleRecursiveReferenceInProfileGroupIgnoresDuplicates() {
|
||||||
MockEnvironment environment = new MockEnvironment();
|
MockEnvironment environment = new MockEnvironment();
|
||||||
environment.setProperty("spring.profiles.active", "a,b,c");
|
environment.setProperty("spring.profiles.active", "a,b,c");
|
||||||
environment.setProperty("spring.profiles.group.a", "a,e,f");
|
environment.setProperty("spring.profiles.group.a", "a,e,f");
|
||||||
|
@ -66,9 +66,9 @@ class CorsSampleActuatorApplicationTests {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
void preflightRequestToEndpointShouldReturnOk() throws Exception {
|
void preflightRequestToEndpointShouldReturnOk() throws Exception {
|
||||||
RequestEntity<?> healthRequest = RequestEntity.options(new URI("/actuator/env"))
|
RequestEntity<?> envRequest = RequestEntity.options(new URI("/actuator/env"))
|
||||||
.header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build();
|
.header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build();
|
||||||
ResponseEntity<?> exchange = this.testRestTemplate.exchange(healthRequest, Map.class);
|
ResponseEntity<?> exchange = this.testRestTemplate.exchange(envRequest, Map.class);
|
||||||
assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK);
|
assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,9 +66,9 @@ class CorsSampleActuatorApplicationTests {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
void preflightRequestToEndpointShouldReturnOk() throws Exception {
|
void preflightRequestToEndpointShouldReturnOk() throws Exception {
|
||||||
RequestEntity<?> healthRequest = RequestEntity.options(new URI("/actuator/env"))
|
RequestEntity<?> envRequest = RequestEntity.options(new URI("/actuator/env"))
|
||||||
.header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build();
|
.header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build();
|
||||||
ResponseEntity<?> exchange = this.testRestTemplate.exchange(healthRequest, Map.class);
|
ResponseEntity<?> exchange = this.testRestTemplate.exchange(envRequest, Map.class);
|
||||||
assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK);
|
assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user